[#2366] Only display authz options for Authz Groups if there are some.

ckan · May 7, 2012 · 4049826 · 4049826
1 parent e2e2578
commit 4049826
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 2 deletions.
diff --git 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
@@ -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
@@ -26,6 +26,7 @@ <h3>Add Roles for Any User</h3>
 
     <hr/>
 
+   <py:if test="c.are_any_authz_groups">
     <h3>Existing Roles for Authorization Groups</h3>
 
     <form id="authzgroup_form" method="POST">
@@ -41,7 +42,7 @@ <h3>Add Roles for Any Authorization Group</h3>
       <button type="submit" name="authz_add" class="btn btn-primary">Add Role</button>
       <div class="clear"></div>
     </form>
-
+   </py:if>
 
 
 

diff --git a/ckan/templates/group/authz.html b/ckan/templates/group/authz.html
@@ -25,6 +25,7 @@ <h3>Add Roles for Any User</h3>
 
     <hr/>
 
+   <py:if test="c.are_any_authz_groups">
     <h3>Update Existing Roles for Authorization Groups</h3>
 
     <form id="authzgroup_form" method="POST">
@@ -40,6 +41,7 @@ <h3>Add Roles for Any Authorization Group</h3>
       <button type="submit" name="authz_add" class="btn btn-primary">Add Role</button>
       <div class="clear"></div>
     </form>
+   </py:if>
 
   </div>
 

diff --git a/ckan/templates/package/authz.html b/ckan/templates/package/authz.html
@@ -25,6 +25,7 @@ <h3>Add Roles for Any User</h3>
 
     <hr/>
 
+   <py:if test="c.are_any_authz_groups">   
     <h3>Update Existing Roles for Authorization Groups</h3>
 
     <form id="authzgroup_form" method="POST">
@@ -40,6 +41,7 @@ <h3>Add Roles for Any Authorization Group</h3>
       <button type="submit" name="authz_add" class="btn btn-primary">Add Role</button>
       <div class="clear"></div>
     </form>
+   </py:if>
 
   </div>