[Erp5-report] r9134 - in /erp5/trunk: bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/loc...

[nobody at svn.erp5.org]

Author: jerome
Date: Thu Aug 10 16:44:15 2006
New Revision: 9134

URL: http://svn.erp5.org?rev=9134&view=rev
Log:
remove assignRoleToSecurityGroupOnParent, if assignRoleToSecurityGroup use a
good security declaration, this is not needed.


Modified:
    erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/scripts/Parent_updateAllLocalRoles.xml
    erp5/trunk/products/ERP5/Document/RoleDefinition.py

Modified: erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/scripts/Parent_updateAllLocalRoles.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/scripts/Parent_updateAllLocalRoles.xml?rev=9134&r1=9133&r2=9134&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/scripts/Parent_updateAllLocalRoles.xml (original)
+++ erp5/trunk/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/scripts/Parent_updateAllLocalRoles.xml Thu Aug 10 16:44:15 2006
@@ -68,7 +68,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value><string>state_change[\'object\'].assignRoleToSecurityGroupOnParent()\n
+            <value><string>state_change[\'object\'].aq_inner.aq_parent.assignRoleToSecurityGroup()\n
 </string> </value>
         </item>
         <item>

Modified: erp5/trunk/products/ERP5/Document/RoleDefinition.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/RoleDefinition.py?rev=9134&r1=9133&r2=9134&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/RoleDefinition.py (original)
+++ erp5/trunk/products/ERP5/Document/RoleDefinition.py Thu Aug 10 16:44:15 2006
@@ -26,11 +26,8 @@
 ##############################################################################
 
 from AccessControl import ClassSecurityInfo
-from Acquisition import aq_parent
-from Acquisition import aq_inner
 from Products.CMFCore.utils import getToolByName
 from Products.CMFCore.WorkflowCore import WorkflowMethod
-
 from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
 from Products.ERP5Type.XMLObject import XMLObject
 
@@ -52,13 +49,3 @@
                       , PropertySheet.DublinCore
                       , PropertySheet.RoleDefinition
                       )
-
-    security.declareProtected(Permissions.ModifyPortalContent,
-                             'assignRoleToSecurityGroupOnParent')
-    def assignRoleToSecurityGroupOnParent(self, **kw):
-      """Assign roles to security group on the parent.
-
-      We redefine this method here, because we want the security check to be
-      performed on the role definition object itself, and not the parent. """
-      aq_parent(aq_inner(self)).assignRoleToSecurityGroup(**kw)
-