CKAN-Extensions
/
ckanext-privatedatasets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #25 from conwetlab/develop 

Return Acquire URL in package_show action
This commit is contained in:
Aitor Magán García 2015-02-19 17:02:48 +01:00
parent 10d707b629 4787b44315
commit a4f7b75c86
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ckanext/privatedatasets/plugin.py
View File

@ -29,6 +29,9 @@ import db
import helpers as helpers
HIDDEN_FIELDS = [constants.ALLOWED_USERS, constants.SEARCHABLE]
class PrivateDatasets(p.SingletonPlugin, tk.DefaultDatasetForm):
p.implements(p.IDatasetForm)
@ -222,12 +225,13 @@ class PrivateDatasets(p.SingletonPlugin, tk.DefaultDatasetForm):
user_obj = context.get('auth_user_obj')
updating_via_api = context.get(constants.CONTEXT_CALLBACK, False)
# allowed_users, searchable and acquire_url fileds can be only viewed by (and only if the dataset is private):
# allowed_users and searchable fileds can be only viewed by (and only if the dataset is private):
# * the dataset creator
# * the sysadmin
# * users allowed to update the allowed_users list via the notification API
if pkg_dict.get('private') is False or not updating_via_api and (not user_obj or (pkg_dict['creator_user_id'] != user_obj.id and not user_obj.sysadmin)):
attrs = [constants.ALLOWED_USERS, constants.SEARCHABLE, constants.ACQUIRE_URL]
# The original list cannot be modified
attrs = list(HIDDEN_FIELDS)
self._delete_pkg_atts(pkg_dict, attrs)
return pkg_dict
@ -250,8 +254,9 @@ class PrivateDatasets(p.SingletonPlugin, tk.DefaultDatasetForm):
def after_search(self, search_results, search_params):
for result in search_results['results']:
# Extra fields should not be returned
attrs = [constants.ALLOWED_USERS, constants.SEARCHABLE, constants.ACQUIRE_URL]
# The original list cannot be modified
attrs = list(HIDDEN_FIELDS)
# Additionally, resources should not be included if the user is not allowed
# to show the resource
context = {

4
ckanext/privatedatasets/tests/test_plugin.py
View File

@ -257,7 +257,7 @@ class PluginTest(unittest.TestCase):
result = self.privateDatasets.after_show(context, pkg_dict) # Call the function
# Check the final result
fields = ['allowed_users', 'searchable', 'acquire_url']
fields = ['allowed_users', 'searchable']
for field in fields:
if fields_expected:
self.assertTrue(field in result)
@ -426,7 +426,7 @@ class PluginTest(unittest.TestCase):
for result in final_search_results['results']:
self.assertNotIn('allowed_users', result)
self.assertNotIn('searchable', result)
self.assertNotIn('acquire_url', result)
self.assertIn('acquire_url', result)
for remaining_field in remaining_fields:
self.assertIn(remaining_field, result)