From da25297f23fe9f5f022aeba275354e095ec8be54 Mon Sep 17 00:00:00 2001 From: Jason Heppler Date: Thu, 15 Aug 2024 11:01:15 -0500 Subject: [PATCH 1/3] refactor: Remove ForensicDetailView in favor of modal view --- denig/views.py | 57 -------------------------------------------------- 1 file changed, 57 deletions(-) diff --git a/denig/views.py b/denig/views.py index c4a351c..cf678f0 100644 --- a/denig/views.py +++ b/denig/views.py @@ -196,63 +196,6 @@ def get(self, request, *args, **kwargs): ) -class ForensicDetailView(generic.DetailView): - model = Image - context_object_name = "forensic_page" - template_name = "forensic_page.html" - - def get_context_data(self, **kwargs): - context = super().get_context_data(**kwargs) - - # Get the current image - current_image = self.object - - # Get previous and next pages - try: - previous_page = ( - Image.objects.filter(id__lt=current_image.id).order_by("-id").first() - ) - except Image.DoesNotExist: - previous_page = None - - try: - next_page = ( - Image.objects.filter(id__gt=current_image.id).order_by("id").first() - ) - except Image.DoesNotExist: - next_page = None - - # Get current page - try: - current_page = Document.objects.get( - document_id=current_image.related_document - ) - except Document.DoesNotExist: - current_page = None - - # Get the page number of the current document - try: - page_number = current_image.related_document.page_range.split("-")[0] - except AttributeError: - page_number = None - - context["previous_image"] = previous_page - context["next_image"] = next_page - context["current_image"] = current_page - context["page_number"] = page_number - context["all_pages"] = Image.objects.filter(image_type="forensics").order_by( - "id" - ) - context["documents"] = ( - Document.objects.filter(attached_images__image_type="forensics") - .order_by("id") - .distinct() - ) - # context["fragments"] = self.object.fragment_set.order_by("line_number") - - return context - - class MusicListView(generic.View): def get(self, request, *args, **kwargs): hymnal_list = ( From b5cf8e5e59e07dac5b419a6548936245e5db0a2a Mon Sep 17 00:00:00 2001 From: Jason Heppler Date: Thu, 15 Aug 2024 11:01:49 -0500 Subject: [PATCH 2/3] refactor: Update URL to point to manuscript page rather than a forensic details page --- templates/forensics.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/templates/forensics.html b/templates/forensics.html index a4c4d66..8a99a51 100644 --- a/templates/forensics.html +++ b/templates/forensics.html @@ -34,8 +34,9 @@

Forensic Images for page {{ document.page_range }}

    • - Document Image + Document Image +
  • From cab9ed85ce76c90bbfef04396e1f7cbf0681891c Mon Sep 17 00:00:00 2001 From: Jason Heppler Date: Thu, 15 Aug 2024 11:02:32 -0500 Subject: [PATCH 3/3] refactor: Remove ForensicDetailView and update URL configuration --- denig/urls.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/denig/urls.py b/denig/urls.py index f40d241..4a1a82a 100644 --- a/denig/urls.py +++ b/denig/urls.py @@ -7,11 +7,6 @@ path("", views.index, name="index"), path("about/", views.about, name="about"), path("forensics/", views.ForensicsListView.as_view(), name="forensics"), - path( - "forensics//", - views.ForensicDetailView.as_view(), - name="forensic_page", - ), path("music/", views.MusicListView.as_view(), name="music"), path("education/", views.education, name="education"), path("scholarship/", views.scholarship, name="scholarship"),