Merge branch '2868-feed-search-error'

ckan · Aug 16, 2012 · 0ae6671 · 0ae6671
2 parents 84c4cbf + 0425e9c
commit 0ae6671
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/ckan/controllers/feed.py b/ckan/controllers/feed.py
@@ -432,7 +432,7 @@ def _parse_url_params(self):
         """
 
         try:
-            page = int(request.params.get('page', 1))
+            page = int(request.params.get('page', 1)) or 1
         except ValueError:
             abort(400, ('"page" parameter must be an integer'))
 

diff --git a/ckan/tests/functional/test_group.py b/ckan/tests/functional/test_group.py
@@ -58,6 +58,20 @@ def setup_class(self):
     def teardown_class(self):
         model.repo.rebuild_db()
 
+    def test_atom_feed_page_zero(self):
+        group_name = 'deletetest'
+        CreateTestData.create_groups([{'name': group_name,
+                                       'packages': []}],
+                                     admin_user_name='russianfan')
+
+        offset = url_for(controller='feed', action='group',
+                         id=group_name)
+        offset = offset + '?page=0'
+        res = self.app.get(offset)
+        assert '<feed' in res, res
+        assert 'xmlns="http://www.w3.org/2005/Atom"' in res, res
+        assert '</feed>' in res, res
+
     def test_children(self):
         if model.engine_is_sqlite() :
             from nose import SkipTest