[Erp5-report] r36726 mohamadou - in /erp5/trunk/bt5/erp5_egov: ExtensionTemplateItem/ bt/

[nobody at svn.erp5.org]

Author: mohamadou
Date: Wed Jun 30 12:58:43 2010
New Revision: 36726

URL: http://svn.erp5.org?rev=36726&view=rev
Log:
* clean EGov_security Extension

Modified:
    erp5/trunk/bt5/erp5_egov/ExtensionTemplateItem/EGovSecurity.py
    erp5/trunk/bt5/erp5_egov/bt/change_log
    erp5/trunk/bt5/erp5_egov/bt/revision

Modified: erp5/trunk/bt5/erp5_egov/ExtensionTemplateItem/EGovSecurity.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/ExtensionTemplateItem/EGovSecurity.py?rev=36726&r1=36725&r2=36726&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/ExtensionTemplateItem/EGovSecurity.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/ExtensionTemplateItem/EGovSecurity.py [utf8] Wed Jun 30 12:58:43 2010
@@ -126,18 +126,19 @@ def setPermissionsOnEGovModule(self, por
                           'WebDAV Lock items','WebDAV Unlock items',
                           'WebDAV access',
                           ]
- 
-  view_permission_list= [ Permissions.AccessContentsInformation, Permissions.ListFolderContents  \
-                        , Permissions.View ]
 
-  role_permission_dict =  {'Anonymous':[Permissions.AccessContentsInformation, Permissions.AddPortalContent \
+  agent_permission_list = [Permissions.AccessContentsInformation, Permissions.AddPortalContent \
                                        ,Permissions.CopyOrMove, Permissions.ModifyPortalContent \
                                        ,Permissions.ListFolderContents,Permissions.View, 'View History' \
-                                       ],
-                           'Agent':    [Permissions.AccessContentsInformation, Permissions.AddPortalContent \
-                                       ,Permissions.CopyOrMove, Permissions.ModifyPortalContent \
-                                       ,Permissions.ListFolderContents,Permissions.View, 'View History' \
-                                       ],
+                                       ]
+  view_permission_list= [ Permissions.AccessContentsInformation, Permissions.ListFolderContents  \
+                        , Permissions.View ]
+
+  citizen_role_list = ['role/citoyen', 'role/citoyen/national', 'role/citoyen/etranger']
+  company_role_list = ['role/entreprise', 'role/entreprise/agence', 'role/entreprise/siege', 'role/entreprise/succursale']
+  agent_role_list = ['role/gouvernement']
+
+  role_permission_dict =  {'Agent':    agent_permission_list,
                            'Associate':[Permissions.AccessContentsInformation, Permissions.ListFolderContents \
                                        ,Permissions.View, Permissions.CopyOrMove, 'View History'  \
                                        ],
@@ -155,23 +156,26 @@ def setPermissionsOnEGovModule(self, por
                            'Manager':  zope_permission_list
                           }
 
-  #XXX if the procedure needs no authentification, 
-  # assume anonymous role can access and add
-  if portal_type_object is not None:
+  #set acquired local role on the portal type
+  portal_type_object.setTypeAcquireLocalRole(1)
+  #Agent role should have access permissions on the portal type
+  portal_type_object.manage_role(role_to_manage='Agent', permissions=view_permission_list)
+
+  # if the procedure needs no authentification anonymous should access and add
+  if portal_type_object  is not None:
     step_authentication =  portal_type_object.getStepAuthentication()
     step_subscription =  portal_type_object.getStepSubscription()
+    if not step_authentication: # and not step_subscription
+      #Anonymous should have access, add, modify and delete permissions on the module
+      self.manage_role(role_to_manage='Anonymous', permissions=agent_permission_list)
+      #Anonymous should also have access to the portal type
+      portal_type_object.manage_role(role_to_manage='Anonymous', permissions=view_permission_list)
+
+  #set acquired permissionson the module
   self.manage_acquiredPermissions(aquired_permission_list)
   for (role, permission_list) in role_permission_dict.items():
-    if role == "Anonymous" and not step_authentication and not step_subscription:
-      self.manage_role(role_to_manage=role, permissions=permission_list)
-      #give anonymous access to the portal type
-      portal_type_object.manage_role(role_to_manage=role, permissions=view_permission_list)
-    elif role != "Anonymous":
-      self.manage_role(role_to_manage=role, permissions=permission_list)
-      if role == "Agent":
-        portal_type_object.manage_role(role_to_manage=role, permissions=permission_list)
-  #set acquired local role on the portal type
-  portal_type_object.setTypeAcquireLocalRole(1)
+    self.manage_role(role_to_manage=role, permissions=permission_list)
+  
 
 def getSecurityCategoryFromAssignment(self, base_category_list, user_name, 
     object, portal_type, child_category_list=[]):

Modified: erp5/trunk/bt5/erp5_egov/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/bt/change_log?rev=36726&r1=36725&r2=36726&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/bt/change_log [utf8] Wed Jun 30 12:58:43 2010
@@ -1,3 +1,6 @@
+2010-06-30 mohamadou
+* clean EGov_security Extension
+
 2010-06-29 mohamadou
 * Add erp5_egov_security skin folder
 

Modified: erp5/trunk/bt5/erp5_egov/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/bt/revision?rev=36726&r1=36725&r2=36726&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/bt/revision [utf8] Wed Jun 30 12:58:43 2010
@@ -1 +1 @@
-660
\ No newline at end of file
+662
\ No newline at end of file