From c85b20cfc2d6296df58507af452e03359ae6318c Mon Sep 17 00:00:00 2001 From: Andrea Lepori Date: Sun, 26 Dec 2021 21:10:33 +0100 Subject: fix wrong filter on doctypes on server index --- server/views.py | 8 ++++++-- version.txt | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/server/views.py b/server/views.py index 8c1732a..f50ae61 100644 --- a/server/views.py +++ b/server/views.py @@ -53,13 +53,17 @@ def index(request): if request.user.is_staff: groups = request.user.groups.all() + q_obj = Q(group__in=groups) + doc_types = DocumentType.objects.filter( - Q(group_private=False) | Q(group=groups[0]) & Q(enabled=True)).order_by("-id") + (Q(group_private=False) | q_obj) & Q(enabled=True)).order_by("-id") else: groups = request.user.groups.all()[1:] + q_obj = Q(group__in=groups) + doc_types = DocumentType.objects.filter( - Q(group_private=False) & Q(enabled=True)).order_by("-id") + Q(group_private=False) & Q(enabled=True) & q_obj).order_by("-id") # check for settings group_check = [] diff --git a/version.txt b/version.txt index b5aac86..571dffe 100644 --- a/version.txt +++ b/version.txt @@ -1,2 +1,2 @@ version=0.4 -rev=4 +rev=5 -- cgit v1.2.1