Enabled pagination for tags in the admin gallery

shannonturner · Jul 14, 2018 · d5993bb · d5993bb
1 parent 4979b6a
commit d5993bb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/metro_map_saver/map_saver/views.py b/metro_map_saver/map_saver/views.py
@@ -34,10 +34,10 @@ def get(self, request, **kwargs):
 
         tags = Tag.objects.all()
 
-        if kwargs.get('page') == 'notags':
+        if kwargs.get('tag') == 'notags':
             visible_maps = SavedMap.objects.filter(gallery_visible=True).filter(tags__exact=None).order_by('id')
-        elif kwargs.get('page') in [t.name for t in tags]:
-            visible_maps = SavedMap.objects.filter(gallery_visible=True).filter(tags__name=kwargs.get('page')).order_by('id')
+        elif kwargs.get('tag') in [t.name for t in tags]:
+            visible_maps = SavedMap.objects.filter(gallery_visible=True).filter(tags__name=kwargs.get('tag')).order_by('id')
         else:
             visible_maps = SavedMap.objects.filter(gallery_visible=True).order_by('id')
 

diff --git a/metro_map_saver/metro_map_saver/urls.py b/metro_map_saver/metro_map_saver/urls.py
@@ -20,7 +20,7 @@
 
 urlpatterns = [
     url(r'^admin/', admin.site.urls),
-    url(r'^(?:save/)?admin/gallery/(?P<page>[0-9\w]+)?$', MapGalleryView.as_view(), name='gallery'),
+    url(r'^(?:save/)?admin/gallery/(?P<tag>[\w]+)?/?(?P<page>[0-9]+)?$', MapGalleryView.as_view(), name='gallery'),
     url(r'^(?:save/)?admin/similar/(?P<urlhash>[0-9a-zA-Z\-\_]+)$', MapSimilarView.as_view(), name='similar'),
     url(r'^(?:save/)?admin/diff/(?P<urlhash_first>[0-9a-zA-Z\-\_]+)/(?P<urlhash_second>[0-9a-zA-Z\-\_]+)', MapDiffView.as_view(), name='diff'),
     url(r'^(?:save/)?admin/action/', MapAdminActionView.as_view(), name='admin_action'),