[#3120] Change working of abort message.

'key' can be defined in the call, so may not always be 'page'.
ckan · Jun 23, 2016 · 003892f · 003892f
1 parent ebcb9eb
commit 003892f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py
@@ -1097,7 +1097,7 @@ def get_page_number(params, key='page', default=1):
             raise ValueError("Negative number not allowed")
     except ValueError:
         import ckan.lib.base as base
-        base.abort(400, ('"page" parameter must be a positive integer'))
+        base.abort(400, ('"{key}" parameter must be a positive integer'))
 
     return p
 

diff --git a/ckan/tests/controllers/test_feed.py b/ckan/tests/controllers/test_feed.py
@@ -2,7 +2,6 @@
 
 from routes import url_for
 
-from ckan import model
 import ckan.tests.helpers as helpers
 import ckan.tests.factories as factories
 
@@ -15,20 +14,20 @@ def test_atom_feed_page_zero_gives_error(self):
                          id=group['name']) + '?page=0'
         app = self._get_test_app()
         res = app.get(offset, status=400)
-        assert '"page" parameter must be a positive integer' in res, res
+        assert '"{key}" parameter must be a positive integer' in res, res
 
     def test_atom_feed_page_negative_gives_error(self):
         group = factories.Group()
         offset = url_for(controller='feed', action='group',
                          id=group['name']) + '?page=-2'
         app = self._get_test_app()
         res = app.get(offset, status=400)
-        assert '"page" parameter must be a positive integer' in res, res
+        assert '"{key}" parameter must be a positive integer' in res, res
 
     def test_atom_feed_page_not_int_gives_error(self):
         group = factories.Group()
         offset = url_for(controller='feed', action='group',
                          id=group['name']) + '?page=abc'
         app = self._get_test_app()
         res = app.get(offset, status=400)
-        assert '"page" parameter must be a positive integer' in res, res
+        assert '"{key}" parameter must be a positive integer' in res, res