Merge branch 'master' into dev

3 files changed, 9 insertions, 8 deletions

diff --git a/accounts/urls.py b/accounts/urls.py
index 3dc7d18..15d8124 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 8c1732a..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

@@ -53,13 +52,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 = []

@@ -326,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..76e6671 100644
--- a/version.txt
+++ b/version.txt
@@ -1,2 +1,2 @@
-version=0.4
-rev=5
+version=0.4

+rev=7