diff --git a/ckan/controllers/admin.py b/ckan/controllers/admin.py index b879daaa181..6c3d48a1fd2 100644 --- a/ckan/controllers/admin.py +++ b/ckan/controllers/admin.py @@ -234,6 +234,8 @@ def action_add_form(users_or_authz_groups): c.authz_groups = authz_groups c.authz_groups_role_dict = authz_groups_role_dict + c.are_any_authz_groups = bool(model.Session.query(model.AuthorizationGroup).count()) + return render('admin/authz.html') def trash(self): diff --git a/ckan/lib/base.py b/ckan/lib/base.py index 4f77150e8a3..c2deeada296 100644 --- a/ckan/lib/base.py +++ b/ckan/lib/base.py @@ -541,7 +541,7 @@ def _prepare_authz_info_for_render(self, user_object_roles): c.user_role_dict = user_role_dict c.authz_groups = authz_groups c.authz_groups_role_dict = authz_groups_role_dict - + c.are_any_authz_groups = bool(model.Session.query(model.AuthorizationGroup).count()) # Include the '_' function in the public names __all__ = [__name for __name in locals().keys() if not __name.startswith('_') \ diff --git a/ckan/templates/admin/authz.html b/ckan/templates/admin/authz.html index 7feaebde128..edb2bc86413 100644 --- a/ckan/templates/admin/authz.html +++ b/ckan/templates/admin/authz.html @@ -26,6 +26,7 @@

Add Roles for Any User


+

Existing Roles for Authorization Groups

@@ -41,7 +42,7 @@

Add Roles for Any Authorization Group

- +
diff --git a/ckan/templates/group/authz.html b/ckan/templates/group/authz.html index 0b778b21188..77c34980cc4 100644 --- a/ckan/templates/group/authz.html +++ b/ckan/templates/group/authz.html @@ -25,6 +25,7 @@

Add Roles for Any User


+

Update Existing Roles for Authorization Groups

@@ -40,6 +41,7 @@

Add Roles for Any Authorization Group

+
diff --git a/ckan/templates/package/authz.html b/ckan/templates/package/authz.html index aca614664b7..55132ec3985 100644 --- a/ckan/templates/package/authz.html +++ b/ckan/templates/package/authz.html @@ -25,6 +25,7 @@

Add Roles for Any User


+

Update Existing Roles for Authorization Groups

@@ -40,6 +41,7 @@

Add Roles for Any Authorization Group

+