* Ok this really fixes the issue where the project page was showing i…

…nactive documents.
bgroff · Nov 8, 2018 · f1cf2f9 · f1cf2f9
1 parent d1de802
commit f1cf2f9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/django_kala/projects/models.py b/django_kala/projects/models.py
@@ -44,8 +44,8 @@ def __str__(self):
 
     def get_documents(self, user):
         if user.is_superuser:
-            return self.document_set.filter(project=self)
-        return self.document_set.filter(
+            return self.document_set.active().filter(project=self)
+        return self.document_set.active().filter(
             project=self,
             id__in=user.get_documents().values_list('id', flat=True)
         )

diff --git a/django_kala/projects/views/projects/project.py b/django_kala/projects/views/projects/project.py
@@ -25,7 +25,7 @@ def get_context_data(self, **kwargs):
         for document in self.documents:
             for version in document.documentversion_set.all():
                 version_ids.append(str(version.uuid))
-        versions = DocumentVersion.objects.active().filter(uuid__in=version_ids).order_by('user_id')
+        versions = DocumentVersion.objects.filter(uuid__in=version_ids).order_by('user_id')
 
         sort_order = self.request.GET.get('sort', None)
         if sort_order: