diff --git a/app/library/templates/library/work_list.html b/app/library/templates/library/work_list.html index 4117cef..6b86e14 100644 --- a/app/library/templates/library/work_list.html +++ b/app/library/templates/library/work_list.html @@ -30,9 +30,6 @@ Composer Edition {% if not collection %}Collection{% endif %} - {% if request.is_admin %} - Copies - {% endif %} @@ -42,9 +39,6 @@ {{ work.composer|truncatewords:3 }} {{ work.edition|truncatewords:2 }} {% if not collection %}{{ work.collection.name }}{% endif %} - {% if request.is_admin %} - {{ work.available }} - {% endif %} {% empty %} No works found diff --git a/app/library/views/__init__.py b/app/library/views/__init__.py index f13ff8c..d281973 100644 --- a/app/library/views/__init__.py +++ b/app/library/views/__init__.py @@ -184,7 +184,7 @@ class LibraryWorkListView(WorkListView): return True def get_works(self): - collections = models.Collection.objects + collections = models.Collection.objects.all() if not self.request.user.is_superuser: collections = collections.filter(administrators=self.request.user) @@ -204,9 +204,9 @@ class CollectionWorkListView(WorkListView): def get_works(self): works = Work.objects.filter(collection=self.kwargs['collection']) - if self.request.is_admin: - loan_count = Count('project_items', Q(project_items__checkout__lte=now(), project_items__returned=None)) - works = works.annotate(loan_count=loan_count) + #if self.request.is_admin: + # loan_count = Count('project_items', Q(project_items__checkout__lte=now(), project_items__returned=None)) + # works = works.annotate(loan_count=loan_count) return works def get_context_data(self, *args, **kwargs):