[#1038] Fix reading config.

ckan · Sep 17, 2013 · fafd9f9 · fafd9f9
1 parent e0bc490
commit fafd9f9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ckan/config/deployment.ini_tmpl b/ckan/config/deployment.ini_tmpl
@@ -66,6 +66,7 @@ ckan.auth.user_create_organizations = true
 ckan.auth.user_delete_groups = true
 ckan.auth.user_delete_organizations = true
 ckan.auth.create_user_via_api = false
+ckan.auth.roles_that_cascade_to_sub_groups = admin
 
 ## Search Settings
 

diff --git a/ckan/new_authz.py b/ckan/new_authz.py
@@ -387,7 +387,7 @@ def check_config_permission(permission):
             CONFIG_PERMISSIONS[perm] = config.get(key, default)
             if isinstance(default, bool):
                 CONFIG_PERMISSIONS[perm] = asbool(CONFIG_PERMISSIONS[perm])
-            elif isinstance(default, list):
+            elif isinstance(default, list) and key in config:
                 CONFIG_PERMISSIONS[perm] = \
                     CONFIG_PERMISSIONS[perm].split(' ') \
                     if CONFIG_PERMISSIONS[perm] else []