Merge branch 'ckylape-keyerror-fix-2.4'

conwetlab · Sep 3, 2015 · 2f62371 · 2f62371
2 parents 22f49c8 + a3c46e5
commit 2f62371
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ckanext/datarequests/controllers/ui_controller.py b/ckanext/datarequests/controllers/ui_controller.py
@@ -280,7 +280,7 @@ def _return_page(errors={}, errors_summary={}):
             # belongs to the organization are shown)
             organization_id = c.datarequest.get('organization_id', '')
             if organization_id:
-                base_datasets = tk.get_action('organization_show')({'ignore_auth': True}, {'id': organization_id})['packages']
+                base_datasets = tk.get_action('organization_show')({'ignore_auth': True}, {'id': organization_id, 'include_datasets': True})['packages']
             else:
                 # FIXME: At this time, only the 500 last modified/created datasets are retrieved.
                 # We assume that a user will close their data request with a recently added or modified dataset

diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
@@ -691,7 +691,7 @@ def _get_action(action):
         datarequest_show.assert_called_once_with(self.expected_context, {'id': datarequest_id})
 
         if organization:
-            organization_show.assert_called_once_with({'ignore_auth': True}, {'id': organization})
+            organization_show.assert_called_once_with({'ignore_auth': True}, {'id': organization, 'include_datasets': True})
         else:
             package_search.assert_called_once_with({'ignore_auth': True}, {'rows': 500})