[#652] Make private resources compatible with legacy mode

ckan · Apr 24, 2013 · eb06a95 · eb06a95
1 parent 43c578e
commit eb06a95
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/ckanext/datastore/logic/action.py b/ckanext/datastore/logic/action.py
@@ -73,7 +73,8 @@ def datastore_create(context, data_dict):
 
     # create a private datastore resource, if necessary
     resource = model.Resource.get(res_id)
-    if resource.resource_group.package.private:
+    legacy_mode = 'ckan.datastore.read_url' not in pylons.config
+    if not legacy_mode and resource.resource_group.package.private:
         data_dict['private'] = True
 
     result = db.create(context, data_dict)

diff --git a/ckanext/datastore/plugin.py b/ckanext/datastore/plugin.py
@@ -222,11 +222,12 @@ def get_actions(self):
         actions = {'datastore_create': action.datastore_create,
                    'datastore_upsert': action.datastore_upsert,
                    'datastore_delete': action.datastore_delete,
-                   'datastore_search': action.datastore_search,
-                   'datastore_make_private': action.datastore_make_private,
-                   'datastore_make_public': action.datastore_make_public}
+                   'datastore_search': action.datastore_search}
         if not self.legacy_mode:
-            actions['datastore_search_sql'] = action.datastore_search_sql
+            actions.update({
+                'datastore_search_sql': action.datastore_search_sql,
+                'datastore_make_private': action.datastore_make_private,
+                'datastore_make_public': action.datastore_make_public})
         return actions
 
     def get_auth_functions(self):