nyymix/muistox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Optimize canonical_url code

Browse source
This commit is contained in:
Nyymix 2025-07-08 23:04:02 +03:00
parent f233809c98
commit 38e03e2ed7
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gallery/views/album.py
View file

@ -45,7 +45,7 @@ class AlbumsList(ListView):
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
page = self.request.GET.get('page') 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}" canonical_url = f"{self.request.build_absolute_uri(reverse('gallery:albums_url'))}?page={page}"
else: else:
canonical_url = self.request.build_absolute_uri(reverse('gallery:albums_url')) 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')) page_obj = paginator.get_page(self.request.GET.get('page'))
# Canonical_url # Canonical_url
page = self.request.GET.get('page') if page_obj.number > 1:
if page and page != '1': canonical_url = f"{self.request.build_absolute_uri(self.object.get_absolute_url())}?page={page_obj.number}"
canonical_url = f"{self.request.build_absolute_uri(self.object.get_absolute_url())}?page={page}"
else: else:
canonical_url = self.request.build_absolute_uri(self.object.get_absolute_url()) canonical_url = self.request.build_absolute_uri(self.object.get_absolute_url())
@ -112,7 +111,7 @@ class AlbumSearch(TemplateView):
# Canonical URL # Canonical URL
page = self.request.GET.get('page') page = self.request.GET.get('page')
base_url = self.request.build_absolute_uri(reverse('gallery:search_url')) 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}" canonical_url = f"{base_url}?page={page}"
else: else:
canonical_url = base_url canonical_url = base_url

2
gallery/views/photo.py
View file

@ -32,7 +32,7 @@ class PhotosList(ListView):
# Canonical_url # Canonical_url
page = self.request.GET.get('page') 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}" canonical_url = f"{self.request.build_absolute_uri(reverse('gallery:photos_url'))}?page={page}"
else: else:
canonical_url = self.request.build_absolute_uri(reverse('gallery:photos_url')) canonical_url = self.request.build_absolute_uri(reverse('gallery:photos_url'))