[Checkins] SVN: Products.PluggableAuthService/branches/1.6/Products/PluggableAuthService/ Merged r120252 from trunk:

[Maurits van Rees]

Log message for revision 120253:
  Merged r120252 from trunk:
  Launchpad #672694: In the ZODBRoleManager made it clearer that
  adding a removing a role does not have much effect if you do not do
  the same in the root of the site (at the bottom of the Security tab
  at manage_access).
  

Changed:
  U   Products.PluggableAuthService/branches/1.6/Products/PluggableAuthService/doc/CHANGES.txt
  U   Products.PluggableAuthService/branches/1.6/Products/PluggableAuthService/plugins/ZODBRoleManager.py
  U   Products.PluggableAuthService/branches/1.6/Products/PluggableAuthService/plugins/www/zrRoles.zpt

-=-
Modified: Products.PluggableAuthService/branches/1.6/Products/PluggableAuthService/doc/CHANGES.txt
===================================================================
--- Products.PluggableAuthService/branches/1.6/Products/PluggableAuthService/doc/CHANGES.txt	2011-02-10 13:04:29 UTC (rev 120252)
+++ Products.PluggableAuthService/branches/1.6/Products/PluggableAuthService/doc/CHANGES.txt	2011-02-10 13:09:31 UTC (rev 120253)
@@ -4,14 +4,19 @@
 PluggableAuthService 1.6.4 (unreleased)
 ---------------------------------------
 
-- TBD
+- Launchpad #672694: In the ZODBRoleManager made it clearer that
+  adding a removing a role does not have much effect if you do not do
+  the same in the root of the site (at the bottom of the Security tab
+  at manage_access).
 
+
 PluggableAuthService 1.6.4 (2010-11-04)
 ---------------------------------------
 
 - Don't fail on users defined in multiple user sources on the ZODBGroupManager
   listing page.
 
+
 PluggableAuthService 1.6.3 (2010-02-01)
 ---------------------------------------
 

Modified: Products.PluggableAuthService/branches/1.6/Products/PluggableAuthService/plugins/ZODBRoleManager.py
===================================================================
--- Products.PluggableAuthService/branches/1.6/Products/PluggableAuthService/plugins/ZODBRoleManager.py	2011-02-10 13:04:29 UTC (rev 120252)
+++ Products.PluggableAuthService/branches/1.6/Products/PluggableAuthService/plugins/ZODBRoleManager.py	2011-02-10 13:09:31 UTC (rev 120253)
@@ -223,6 +223,10 @@
         """ Remove 'role_id' from the list of roles managed by this object.
 
         o Raise KeyError if not found.
+
+        Note that if you really want to remove a role you should first
+        remove it from the roles in the root of the site (at the
+        bottom of the Security tab at manage_access).
         """
         for principal_id in self._principal_roles.keys():
             self.removeRoleFromPrincipal( role_id, principal_id )
@@ -397,7 +401,11 @@
                           , RESPONSE
                           , REQUEST=None
                           ):
-        """ Remove one or more roles via the ZMI.
+        """ Remove one or more role assignments via the ZMI.
+
+        Note that if you really want to remove a role you should first
+        remove it from the roles in the root of the site (at the
+        bottom of the Security tab at manage_access).
         """
         role_ids = filter( None, role_ids )
 
@@ -409,7 +417,7 @@
             for role_id in role_ids:
                 self.removeRole( role_id )
 
-            message = 'Roles+removed'
+            message = 'Role+assignments+removed'
 
         RESPONSE.redirect( '%s/manage_roles?manage_tabs_message=%s'
                          % ( self.absolute_url(), message )

Modified: Products.PluggableAuthService/branches/1.6/Products/PluggableAuthService/plugins/www/zrRoles.zpt
===================================================================
--- Products.PluggableAuthService/branches/1.6/Products/PluggableAuthService/plugins/www/zrRoles.zpt	2011-02-10 13:04:29 UTC (rev 120252)
+++ Products.PluggableAuthService/branches/1.6/Products/PluggableAuthService/plugins/www/zrRoles.zpt	2011-02-10 13:09:31 UTC (rev 120253)
@@ -17,6 +17,11 @@
 
 <h3> Current Roles <a href="?adding=1">(Add a role)</a></h3>
 
+<p>
+  Note that adding or removing a role here does not have much effect
+  if you do not do the same in the root of the site (at the bottom of
+  the Security tab at manage_access).
+</p>
 <table width="100%" cellpadding="2" cellspacing="0">
 
  <tr>
@@ -62,7 +67,7 @@
   <td colspan="3">
     <input type="hidden" name="role_ids:list:default" value="" />
     <input type="submit" name="manage_removeRoles:method"
-           value=" Remove Roles " />
+           value=" Remove Role Assignment " />
   </td>
  </tr>