diff --git a/loko/documents/templates/documents/base_documents.html b/loko/documents/templates/documents/base_documents.html index 4ffc9bc..b9b70a2 100644 --- a/loko/documents/templates/documents/base_documents.html +++ b/loko/documents/templates/documents/base_documents.html @@ -1,88 +1,2 @@ {% extends "base.html" %} -{% load i18n documents_tags %} - -{% block head %} - {{ block.super }} - -{% endblock head %} - -{% block sidebar %} - - - {% translate "All documents" %} - - -
- - - {% render_folder_tree folder_tree active_folder_slug active_trail_slugs %} -{% endblock sidebar %} - - - -{% block script %} - - - -{% endblock script %} \ No newline at end of file +{% load i18n %} \ No newline at end of file diff --git a/loko/documents/tests.py b/loko/documents/tests.py index a8224d8..1f3ba48 100644 --- a/loko/documents/tests.py +++ b/loko/documents/tests.py @@ -513,7 +513,7 @@ class DocumentDeletionPermissionTests(TestCase): other_doc.folders.add(root_folder) self.client.force_login(self.manager) - response = self.client.get(reverse("documents:list")) + response = self.client.get(reverse("documents:list"), {"folder": root_folder.slug}) self.assertEqual(response.status_code, 200) delete_url = reverse("documents:delete", args=[other_doc.pk]) self.assertContains(response, delete_url) @@ -542,7 +542,7 @@ class DocumentDeletionPermissionTests(TestCase): other_doc.folders.add(root_folder) self.client.force_login(self.manager) - response = self.client.get(reverse("documents:list")) + response = self.client.get(reverse("documents:list"), {"folder": root_folder.slug}) self.assertEqual(response.status_code, 200) delete_url = reverse("documents:delete", args=[other_doc.pk]) self.assertNotContains(response, delete_url) diff --git a/loko/documents/views.py b/loko/documents/views.py index 7e41a33..d3dc9f7 100644 --- a/loko/documents/views.py +++ b/loko/documents/views.py @@ -262,6 +262,8 @@ class DocumentListView(DocumentsAppAccessMixin, LoginRequiredMixin, ListView): ) else: queryset = queryset.filter(folders=self.current_folder) + elif not self.search_term and not tag and not doc_type: + queryset = queryset.filter(folders__isnull=True) if self.search_term: queryset = queryset.filter(title__icontains=self.search_term)