Optimize canonical_url code
This commit is contained in:
parent
f233809c98
commit
38e03e2ed7
2 changed files with 5 additions and 6 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue