Merge branch '2939-orgs' of github.com:okfn/ckan into 2939-orgs

ckan · Nov 13, 2012 · e96d979 · e96d979
2 parents 521607e + 2754b34
commit e96d979
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/ckan/logic/action/create.py b/ckan/logic/action/create.py
@@ -1158,7 +1158,7 @@ def _group_or_org_member_create(context, data_dict, is_org=False):
     logic.get_action('member_create')(member_create_context, member_dict)
 
 def group_member_create(context, data_dict):
-    return _group_or_org_member_create(context, data_dict, is_org=True)
+    return _group_or_org_member_create(context, data_dict)
 
 def organization_member_create(context, data_dict):
     return _group_or_org_member_create(context, data_dict, is_org=True)
diff --git a/ckan/logic/action/update.py b/ckan/logic/action/update.py
@@ -987,7 +987,7 @@ def package_owner_org_update(context, data_dict):
     name_or_id = data_dict.get('id')
     organization_id = data_dict.get('organization_id')
 
-    # FIXME auth
+    _check_access('package_owner_org_update', context, data_dict)
 
     pkg = model.Package.get(name_or_id)
     if pkg is None:

diff --git a/ckan/logic/auth/update.py b/ckan/logic/auth/update.py
@@ -172,3 +172,6 @@ def group_update_rest(context, data_dict):
 
     return group_update(context, data_dict)
 
+def package_owner_org_update(context, data_dict):
+    # sysadmins only
+    return {'success': False}
diff --git a/ckan/templates/package/read.html b/ckan/templates/package/read.html
@@ -103,6 +103,7 @@ <h1>{{ pkg.title or pkg.name }}
     {% if pkg.private %}
       {% snippet "snippets/private.html" %}
     {% endif %}
+  {% endblock %}
 
   {% if not pkg.private %}
     {% block package_groups %}