[Erp5-report] r10612 - in /erp5/trunk/products/ERP5Type: ERP5Type.py RoleProviderBase.py

[nobody at svn.erp5.org]

Author: jerome
Date: Sun Oct  8 14:52:51 2006
New Revision: 10612

URL: http://svn.erp5.org?rev=10612&view=rev
Log:
Do not fail assigning security to an unowned object.
remove manage_editLocalRolesForm method, we actually use RoleProviderBase.manage_editRolesForm instead.


Modified:
    erp5/trunk/products/ERP5Type/ERP5Type.py
    erp5/trunk/products/ERP5Type/RoleProviderBase.py

Modified: erp5/trunk/products/ERP5Type/ERP5Type.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/ERP5Type.py?rev=10612&r1=10611&r2=10612&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/ERP5Type.py (original)
+++ erp5/trunk/products/ERP5Type/ERP5Type.py Sun Oct  8 14:52:51 2006
@@ -385,7 +385,7 @@
         # First try to guess from the owner
         try:
           user_name = ob.getOwnerInfo()['id']
-        except AttributeError:
+        except (AttributeError, TypeError):
           pass
       if user_name is None:
         if ERP5UserManager is not None:
@@ -619,22 +619,6 @@
         _aq_reset() # XXX We should also call it whenever we change workflow defition
       return result
 
-    security.declareProtected( Permissions.ManagePortal,
-                              'manage_editLocalRolesForm' )
-    def manage_editLocalRolesForm( self, REQUEST, manage_tabs_message=None ):
-
-        """ Show the 'Local Roles' management tab.
-        """
-        role_list = []
-
-        return self._roles_form( self
-                                 , REQUEST
-                                 , roles=role_list
-                                 , possible_permissions=()
-                                 , management_view='Roles'
-                                 , manage_tabs_message=manage_tabs_message
-                                 )
-
     def reorderActions(self, REQUEST=None):
       """Reorder actions according to their priorities."""
       new_actions = self._cloneActions()

Modified: erp5/trunk/products/ERP5Type/RoleProviderBase.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/RoleProviderBase.py?rev=10612&r1=10611&r2=10612&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/RoleProviderBase.py (original)
+++ erp5/trunk/products/ERP5Type/RoleProviderBase.py Sun Oct  8 14:52:51 2006
@@ -260,8 +260,11 @@
       i = 0
       for brain in portal_catalog(portal_type = self.id):
         obj = brain.getObject()
-        userdb_path, user_id = obj.getOwnerTuple()
-        obj.assignRoleToSecurityGroup(user_name = user_id)
+        user_id = None
+        owner_tuple = obj.getOwnerTuple()
+        if owner_tuple is not None:
+          user_id = owner_tuple[1]
+        obj.updateLocalRolesOnSecurityGroups(user_name = user_id)
         i += 1
 
       return self.manage_editRolesForm(REQUEST, manage_tabs_message='%d objects updated' % (i,))