[ckan#2981] Preserve sort order in groups on pagination

- Uses the same code that was introuced in ckan#2153 for organizations
- Changes the tests to sort descending so that they actually make sure
  that the sort order is not changed

ckan/templates/group/index.html

@@ -34,7 +34,7 @@ <h1 class="hide-heading">{{ _('Groups') }}</h1>
     {% endif %}
   {% endblock %}
   {% block page_pagination %}
-    {{ c.page.pager() }}
+    {{ c.page.pager(q=c.q or '', sort=c.sort_by_selected or '') }}
   {% endblock %}
 {% endblock %}
 

ckan/tests/controllers/test_group.py

@@ -23,17 +23,34 @@ def test_bulk_process_throws_404_for_nonexistent_org(self):
                                    action='bulk_process', id='does-not-exist')
         app.get(url=bulk_process_url, status=404)
 
-    def test_page_thru_list_of_orgs(self):
-        orgs = [factories.Organization() for i in range(35)]
+    def test_page_thru_list_of_orgs_preserves_sort_order(self):
+        orgs = [factories.Organization() for _ in range(35)]
         app = self._get_test_app()
-        org_url = url_for(controller='organization', action='index')
+        org_url = url_for(controller='organization',
+                          action='index',
+                          sort='name desc')
         response = app.get(url=org_url)
-        assert orgs[0]['name'] in response
-        assert orgs[-1]['name'] not in response
+        assert orgs[-1]['name'] in response
+        assert orgs[0]['name'] not in response
 
         response2 = response.click('2')
-        assert orgs[0]['name'] not in response2
-        assert orgs[-1]['name'] in response2
+        assert orgs[-1]['name'] not in response2
+        assert orgs[0]['name'] in response2
+
+    def test_page_thru_list_of_groups_preserves_sort_order(self):
+        groups = [factories.Group() for _ in range(35)]
+        app = self._get_test_app()
+        group_url = url_for(controller='group',
+                            action='index',
+                            sort='title desc')
+
+        response = app.get(url=group_url)
+        assert groups[-1]['title'] in response
+        assert groups[0]['title'] not in response
+
+        response2 = response.click(r'^2$')
+        assert groups[-1]['title'] not in response2
+        assert groups[0]['title'] in response2
 
 
 def _get_group_new_page(app):