From 38e03e2ed7a016f68f51554311218e91fa6872b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9DNyymix=E2=80=9D?= Date: Tue, 8 Jul 2025 23:04:02 +0300 Subject: [PATCH] Optimize canonical_url code --- gallery/views/album.py | 9 ++++----- gallery/views/photo.py | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/gallery/views/album.py b/gallery/views/album.py index d4b36de..7a8917a 100644 --- a/gallery/views/album.py +++ b/gallery/views/album.py @@ -45,7 +45,7 @@ class AlbumsList(ListView): context = super().get_context_data(**kwargs) page = self.request.GET.get('page') - if page and page != '1': + if page_obj.number > 1: canonical_url = f"{self.request.build_absolute_uri(reverse('gallery:albums_url'))}?page={page}" else: canonical_url = self.request.build_absolute_uri(reverse('gallery:albums_url')) @@ -74,9 +74,8 @@ class AlbumDetail(DetailView): page_obj = paginator.get_page(self.request.GET.get('page')) # Canonical_url - page = self.request.GET.get('page') - if page and page != '1': - canonical_url = f"{self.request.build_absolute_uri(self.object.get_absolute_url())}?page={page}" + if page_obj.number > 1: + canonical_url = f"{self.request.build_absolute_uri(self.object.get_absolute_url())}?page={page_obj.number}" else: canonical_url = self.request.build_absolute_uri(self.object.get_absolute_url()) @@ -112,7 +111,7 @@ class AlbumSearch(TemplateView): # Canonical URL page = self.request.GET.get('page') base_url = self.request.build_absolute_uri(reverse('gallery:search_url')) - if page and page != '1': + if page_obj.number > 1: canonical_url = f"{base_url}?page={page}" else: canonical_url = base_url diff --git a/gallery/views/photo.py b/gallery/views/photo.py index 162ef64..3fd3ddf 100644 --- a/gallery/views/photo.py +++ b/gallery/views/photo.py @@ -32,7 +32,7 @@ class PhotosList(ListView): # Canonical_url page = self.request.GET.get('page') - if page and page != '1': + if page_obj.number > 1: canonical_url = f"{self.request.build_absolute_uri(reverse('gallery:photos_url'))}?page={page}" else: canonical_url = self.request.build_absolute_uri(reverse('gallery:photos_url'))