From bc9d7fbd2557bf6a2094a01af0bdee7c6d3f0a42 Mon Sep 17 00:00:00 2001
From: kindly <kindly@gmail.com>
Date: Fri, 24 Jan 2014 13:52:49 +0000
Subject: [PATCH] [#1453] remove item for select list if config not set by
 adding helper and change validator to fail when config is set with empty
 string

---
 ckan/lib/helpers.py                                       | 4 ++++
 ckan/logic/validators.py                                  | 4 ++--
 ckan/templates/package/snippets/package_basic_fields.html | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py
index a96004b35e6..91556fa5d7a 100644
--- a/ckan/lib/helpers.py
+++ b/ckan/lib/helpers.py
@@ -38,6 +38,7 @@
 import ckan.lib.datapreview as datapreview
 import ckan.logic as logic
 import ckan.lib.uploader as uploader
+import ckan.new_authz as new_authz
 
 from ckan.common import (
     _, ungettext, g, c, request, session, json, OrderedDict
@@ -1753,6 +1754,8 @@ def get_site_statistics():
 
     return stats
 
+def check_config_permission(permission):
+    return new_authz.check_config_permission(permission)
 
 # these are the functions that will end up in `h` template helpers
 __allowed_functions__ = [
@@ -1855,4 +1858,5 @@ def get_site_statistics():
     'get_featured_organizations',
     'get_featured_groups',
     'get_site_statistics',
+    'check_config_permission',
 ]
diff --git a/ckan/logic/validators.py b/ckan/logic/validators.py
index 977fd80fb19..8c32940c5f3 100644
--- a/ckan/logic/validators.py
+++ b/ckan/logic/validators.py
@@ -33,8 +33,8 @@ def owner_org_validator(key, data, errors, context):
     user = context['user']
     user = model.User.get(user)
     if value == '' :
-        if new_authz.check_config_permission('create_unowned_dataset'):
-            return
+        if not new_authz.check_config_permission('create_unowned_dataset'):
+            raise Invalid(_('A organization must be supplied'))
         # only sysadmins can remove datasets from org
         if not user.sysadmin:
             raise Invalid(_('You cannot remove a dataset from an existing organization'))
diff --git a/ckan/templates/package/snippets/package_basic_fields.html b/ckan/templates/package/snippets/package_basic_fields.html
index 585d6450270..0418e3be2f8 100644
--- a/ckan/templates/package/snippets/package_basic_fields.html
+++ b/ckan/templates/package/snippets/package_basic_fields.html
@@ -69,7 +69,9 @@
       <label for="field-organizations" class="control-label">{{ _('Organization') }}</label>
       <div class="controls">
         <select id="field-organizations" name="owner_org" data-module="autocomplete">
-          <option value="" {% if not selected_org and data.id %} selected="selected" {% endif %}>{{ _('No organization') }}</option>
+          {% if h.check_config_permission('create_unowned_dataset') %}
+             <option value="" {% if not selected_org and data.id %} selected="selected" {% endif %}>{{ _('No organization') }}</option>
+          {% endif %}
           {% for organization in organizations_available %}
             {# get out first org from users list only if there is not an existing org #}
             {% set selected_org = (existing_org and existing_org == organization.id) or (not existing_org and not data.id and organization.id == organizations_available[0].id) %}