From 1ebb8ebf65b73847ffb530912a300a24d1a612cc Mon Sep 17 00:00:00 2001 From: amercader Date: Thu, 12 Dec 2013 15:54:50 +0000 Subject: [PATCH] Revert "[#1188] Allow organization dropdown to be displayed" There is certain logic, albeit a bit flacky, in hiding the organization dropwdown, in that if shown, any user belonging to an organization could take ownership of any unowned dataset in the instance. We need to properly define the auth rules and enforce them at the validator level as well. For the time being, showing the dropdown only to sysadmins makes sense (and of course fixing the original bug on the visibility field validator, which is done on the next commit) This reverts commit f366ba684340adbb903b78bc5beb871069a6a0c2. --- ckan/templates/package/snippets/package_basic_fields.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ckan/templates/package/snippets/package_basic_fields.html b/ckan/templates/package/snippets/package_basic_fields.html index 8db5763da95..585d6450270 100644 --- a/ckan/templates/package/snippets/package_basic_fields.html +++ b/ckan/templates/package/snippets/package_basic_fields.html @@ -56,8 +56,8 @@ {% set dataset_has_organization = data.owner_org or data.group_id %} {% set organizations_available = h.organizations_available('create_dataset') %} {% set user_is_sysadmin = h.check_access('sysadmin') %} - {% set show_organizations_selector = organizations_available %} - {% set show_visibility_selector = dataset_has_organization or organizations_available %} + {% set show_organizations_selector = organizations_available and (user_is_sysadmin or dataset_is_draft) %} + {% set show_visibility_selector = dataset_has_organization or (organizations_available and (user_is_sysadmin or dataset_is_draft)) %} {% if show_organizations_selector and show_visibility_selector %}