[Erp5-report] r25612 - /erp5/trunk/products/ERP5Type/DocumentationHelper/

[nobody at svn.erp5.org]

Author: jm
Date: Wed Feb 18 18:36:56 2009
New Revision: 25612

URL: http://svn.erp5.org?rev=25612&view=rev
Log:
Fix display of permissions on workflow states.

Modified:
    erp5/trunk/products/ERP5Type/DocumentationHelper/DCWorkflowDocumentationHelper.py
    erp5/trunk/products/ERP5Type/DocumentationHelper/DCWorkflowStateDocumentationHelper.py

Modified: erp5/trunk/products/ERP5Type/DocumentationHelper/DCWorkflowDocumentationHelper.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/DocumentationHelper/DCWorkflowDocumentationHelper.py?rev=25612&r1=25611&r2=25612&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/DocumentationHelper/DCWorkflowDocumentationHelper.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/DocumentationHelper/DCWorkflowDocumentationHelper.py [utf8] Wed Feb 18 18:36:56 2009
@@ -32,25 +32,26 @@
 from Products.ERP5Type import Permissions
 from Products.DCWorkflowGraph.DCWorkflowGraph import getGraph
 
-def getStatePermissionsOfRole(state=None, role=''):
+def getStatePermissionsOfRole(state, role):
+  """
+  Returns list of permissions for a given role with AVMC format above
+    A = Access contents information
+    V = View
+    M = Modify Portal Content
+    C = Add Portal Content
+  """
   permissions = ""
-  if state != None:
-    if hasattr(state, '__dict__'):
-      if 'permission_roles' in state.__dict__.keys():
-        if 'View' in state.__dict__['permission_roles'].keys():
-          if role in state.__dict__['permission_roles']['View']:
-            permissions += "V"
-        if 'Access contents information' in state.__dict__['permission_roles'].keys():
-          if role in state.__dict__['permission_roles']['Access contents information']:
-            permissions += "A"
-        if 'Modify portal content' in state.__dict__['permission_roles'].keys():
-          if role in state.__dict__['permission_roles']['Modify portal content']:
-            permissions += "M"
-        if 'Add portal content' in state.__dict__['permission_roles'].keys():
-          if role in state.__dict__['permission_roles']['Add portal content']:
-            permissions += "C"
+  permission_roles = state.permission_roles
+  if permission_roles:
+    if role in permission_roles.get('Access contents information', ()):
+      permissions += "A"
+    if role in permission_roles.get('View', ()):
+      permissions += "V"
+    if role in permission_roles.get('Modify portal content', ()):
+      permissions += "M"
+    if role in permission_roles.get('Add portal content', ()):
+      permissions += "C"
   return permissions
-
 
 class DCWorkflowDocumentationHelper(DocumentationHelper):
   """

Modified: erp5/trunk/products/ERP5Type/DocumentationHelper/DCWorkflowStateDocumentationHelper.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/DocumentationHelper/DCWorkflowStateDocumentationHelper.py?rev=25612&r1=25611&r2=25612&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/DocumentationHelper/DCWorkflowStateDocumentationHelper.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/DocumentationHelper/DCWorkflowStateDocumentationHelper.py [utf8] Wed Feb 18 18:36:56 2009
@@ -28,8 +28,9 @@
 
 from AccessControl import ClassSecurityInfo
 from Globals import InitializeClass
+from Products.ERP5Type import Permissions
 from DocumentationHelper import DocumentationHelper
-from Products.ERP5Type import Permissions
+from DCWorkflowDocumentationHelper import getStatePermissionsOfRole
 
 class DCWorkflowStateDocumentationHelper(DocumentationHelper):
   """
@@ -53,25 +54,7 @@
     return self.getDocumentedObject().transitions
 
   def getPermissionsOfRole(self, role):
-    """
-    Returns list of permissions for a given role with AVMC format above
-      A = Access contents information
-      V = View
-      M = Modify Portal Content
-      C = Add Portal Content
-    """
-    permissions = ""
-    permission_roles = self.getDocumentedObject().permission_roles
-    if permission_roles:
-      if role in state.permission_roles.get('Access contents information', ()):
-        permissions += "A"
-      if role in state.permission_roles.get('View', ()):
-        permissions += "V"
-      if role in state.permission_roles.get('Modify portal content', ()):
-        permissions += "M"
-      if role in state.permission_roles.get('Add portal content', ()):
-        permissions += "C"
-    return permissions
+    return getStatePermissionsOfRole(self.getDocumentedObject(), role)
 
   security.declareProtected(Permissions.AccessContentsInformation, 'getPermissionsOfRoleOwner')
   def getPermissionsOfRoleOwner(self):