From c85b20cfc2d6296df58507af452e03359ae6318c Mon Sep 17 00:00:00 2001
From: Andrea Lepori <alepori@student.ethz.ch>
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


From 536ec9fbca0a3ebc082dd98bf575bbef2949e94e Mon Sep 17 00:00:00 2001
From: Andrea Lepori <alepori@student.ethz.ch>
Date: Sun, 26 Dec 2021 21:14:34 +0100
Subject: remove unused variables/imports

---
 accounts/urls.py | 2 +-
 server/views.py  | 3 ---
 version.txt      | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/accounts/urls.py b/accounts/urls.py
index 6a44457..371c731 100644
--- a/accounts/urls.py
+++ b/accounts/urls.py
@@ -1,4 +1,4 @@
-from django.urls import path, include
+from django.urls import path
 
 from . import views
 
diff --git a/server/views.py b/server/views.py
index f50ae61..78be0b2 100644
--- a/server/views.py
+++ b/server/views.py
@@ -11,7 +11,6 @@ from django.template.loader import get_template
 from django.conf import settings
 from django.contrib.admin.views.decorators import staff_member_required
 from django.contrib.auth.decorators import user_passes_test
-from django.contrib.contenttypes.models import ContentType
 from django.contrib.sessions.backends.db import SessionStore
 
 import csv
@@ -330,8 +329,6 @@ def doctype(request):
             1:]
 
     if request.method == "POST":
-        selected = []
-
         # check if request to edit
         if request.POST["action"][0] == 'e':
             document_type = DocumentType.objects.get(id=request.POST["action"][1:])
diff --git a/version.txt b/version.txt
index 571dffe..dd1392a 100644
--- a/version.txt
+++ b/version.txt
@@ -1,2 +1,2 @@
 version=0.4
-rev=5
+rev=6
-- 
cgit v1.2.1