#550 Fork PaginatedCatalogPage class

fidals · Aug 29, 2018 · f2313ab · f2313ab
1 parent 1dbb068
commit f2313ab
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 19 deletions.
diff --git a/shopelectro/urls.py b/shopelectro/urls.py
@@ -50,13 +50,13 @@ def cache_page(arg):  # Ignore PyFlakesBear
 catalog_urls = [
     # "category" group
     url(r'^categories/(?P<slug>[\w-]+)/$',
-        cached_2h(views.DBContextCategoryPage.as_view()), name='category'),
+        cached_2h(views.PaginationCategoryPage.as_view()), name='category'),
     url(r'^categories/(?P<slug>[\w-]+)/tags/(?P<tags>[\w_-]+)/$',
-        cached_2h(views.DBContextCategoryPage.as_view()), name='category'),
+        cached_2h(views.PaginationCategoryPage.as_view()), name='category'),
     url(r'^categories/(?P<slug>[\w-]+)/(?P<sorting>[0-9]*)/$',
-        views.DBContextCategoryPage.as_view(), name='category'),
+        views.PaginationCategoryPage.as_view(), name='category'),
     url(r'^categories/(?P<slug>[\w-]+)/(?P<sorting>[0-9]*)/tags/(?P<tags>[\w_-]+)/$',
-        views.DBContextCategoryPage.as_view(), name='category'),
+        views.PaginationCategoryPage.as_view(), name='category'),
     # "load more" group
     url(r'categories/(?P<category_slug>[\w-]+)/load-more/'
         r'(?P<offset>[0-9]+)/(?P<sorting>[0-9]*)/$',

diff --git a/shopelectro/views/catalog.py b/shopelectro/views/catalog.py
@@ -257,6 +257,29 @@ def get_context_data(self, **kwargs):
 class DBContextCategoryPage(TaggedCategoryPage):
     """Process db page data as db context."""
 
+    def get_object(self, queryset=None):
+        page = super().get_object(queryset)
+
+        def template_context(page, tag_titles, tags):
+            return {
+                'page': page,
+                'tag_titles': tag_titles,
+                'tags': tags,
+            }
+
+        tags = super().get_tags()
+        if tags:
+            # TODO - move to QuerySet
+            tag_titles = models.serialize_tags_to_title(tags)
+            page.get_template_render_context = partial(
+                template_context, page, tag_titles, tags
+            )
+
+        return page
+
+
+class PaginationCategoryPage(DBContextCategoryPage):
+
     def get_sorting_index(self):
         return int(self.kwargs.get('sorting', 0))
 
@@ -275,21 +298,6 @@ def get_context_data(self, **kwargs):
 
         products = self.get_products()
 
-        def template_context(page, tag_titles, tags):
-            return {
-                'page': page,
-                'tag_titles': tag_titles,
-                'tags': tags,
-            }
-
-        tags = super().get_tags()
-        if tags:
-            tag_titles = models.serialize_tags_to_title(tags)
-            page = context['page']
-            page.get_template_render_context = partial(
-                template_context, page, tag_titles, tags
-            )
-
         paginated_page = get_paginated_page_or_404(products, products_on_page, page_number)
         total_products = products.count()
         products = paginated_page.object_list