Skip to content

erp5
erp5
Commit 262e68c3 authored by wenjie.zheng's avatar wenjie.zheng
Browse files
Options

A version which role mapping works correctly as DCWorflow. But no group mapping.

parent 9f0f514a
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 912 deletions
bt5/erp5_workflow/PortalTypeTemplateItem/portal_types/PermissionRoles.xml deleted 100644 → 0
View file @ 9f0f514a
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Base Type" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>content_icon</string> </key>
<value> <string>document.gif</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>An ERP5 permission roles bonder.</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>PermissionRoles</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>permission</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Base Type</string> </value>
</item>
<item>
<key> <string>type_class</string> </key>
<value> <string>PermissionRoles</string> </value>
</item>
<item>
<key> <string>type_interface</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>type_mixin</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_workflow/PortalTypeTemplateItem/portal_types/State.xml deleted 100644 → 0
View file @ 9f0f514a
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Base Type" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_property_domain_dict</string> </key>
<value>
<dictionary>
<item>
<key> <string>short_title</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>content_icon</string> </key>
<value> <string>document.gif</string> </value>
</item>
<item>
<key> <string>content_meta_type</string> </key>
<value> <string>ERP5 State</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>\n
A ERP5 State.\n
</string> </value>
</item>
<item>
<key> <string>factory</string> </key>
<value> <string>addState</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>State</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>permission</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>type_class</string> </key>
<value> <string>State</string> </value>
</item>
<item>
<key> <string>type_interface</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>type_mixin</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>domain_name</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>property_name</string> </key>
<value> <string>short_title</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>domain_name</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>property_name</string> </key>
<value> <string>title</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_workflow/PortalTypeTemplateItem/portal_types/Transition%20Variable.xml deleted 100644 → 0
View file @ 9f0f514a
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Base Type" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_property_domain_dict</string> </key>
<value>
<dictionary>
<item>
<key> <string>short_title</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>acquire_local_roles</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>content_icon</string> </key>
<value> <string>document.gif</string> </value>
</item>
<item>
<key> <string>content_meta_type</string> </key>
<value> <string>ERP5 Variable</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>A ERP5 Transition Variable.\n
</string> </value>
</item>
<item>
<key> <string>factory</string> </key>
<value> <string>addVariable</string> </value>
</item>
<item>
<key> <string>filter_content_types</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>group_list</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Transition Variable</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>type_class</string> </key>
<value> <string>Variable</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>domain_name</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>property_name</string> </key>
<value> <string>short_title</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>domain_name</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>property_name</string> </key>
<value> <string>title</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_workflow/PortalTypeTemplateItem/portal_types/Transition.xml deleted 100644 → 0
View file @ 9f0f514a
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Base Type" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_property_domain_dict</string> </key>
<value>
<dictionary>
<item>
<key> <string>short_title</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>acquire_local_roles</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>content_icon</string> </key>
<value> <string>document.gif</string> </value>
</item>
<item>
<key> <string>content_meta_type</string> </key>
<value> <string>ERP5 Transition</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string> A ERP5 Transition.\n
</string> </value>
</item>
<item>
<key> <string>factory</string> </key>
<value> <string>addTransition</string> </value>
</item>
<item>
<key> <string>filter_content_types</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>group_list</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Transition</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>type_class</string> </key>
<value> <string>Transition</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>domain_name</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>property_name</string> </key>
<value> <string>short_title</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>domain_name</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>property_name</string> </key>
<value> <string>title</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_workflow/PortalTypeTemplateItem/portal_types/Variable.xml deleted 100644 → 0
View file @ 9f0f514a
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Base Type" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_property_domain_dict</string> </key>
<value>
<dictionary>
<item>
<key> <string>short_title</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>content_icon</string> </key>
<value> <string>document.gif</string> </value>
</item>
<item>
<key> <string>content_meta_type</string> </key>
<value> <string>ERP5 Variable</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>\n
A ERP5 Variable.\n
</string> </value>
</item>
<item>
<key> <string>factory</string> </key>
<value> <string>addVariable</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Variable</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>type_class</string> </key>
<value> <string>Variable</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>domain_name</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>property_name</string> </key>
<value> <string>short_title</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>domain_name</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>property_name</string> </key>
<value> <string>title</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_workflow/PortalTypeTemplateItem/portal_types/Workflow%20Module.xml deleted 100644 → 0
View file @ 9f0f514a
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Base Type" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_property_domain_dict</string> </key>
<value>
<dictionary>
<item>
<key> <string>short_title</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>acquire_local_roles</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>content_icon</string> </key>
<value> <string>folder_icon.gif</string> </value>
</item>
<item>
<key> <string>content_meta_type</string> </key>
<value> <string>ERP5 Folder</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Folders allow to store a large number of documents (1,000,000 should not\n
be a problem).</string> </value>
</item>
<item>
<key> <string>factory</string> </key>
<value> <string>addFolder</string> </value>
</item>
<item>
<key> <string>filter_content_types</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>group_list</string> </key>
<value>
<tuple>
<string>module</string>
</tuple>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Workflow Module</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>type_class</string> </key>
<value> <string>Folder</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>domain_name</string> </key>
<value> <string>erp5_ui</string> </value>
</item>
<item>
<key> <string>property_name</string> </key>
<value> <string>short_title</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>domain_name</string> </key>
<value> <string>erp5_ui</string> </value>
</item>
<item>
<key> <string>property_name</string> </key>
<value> <string>title</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_workflow/PortalTypeTemplateItem/portal_types/Workflow.xml deleted 100644 → 0
View file @ 9f0f514a
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Base Type" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_property_domain_dict</string> </key>
<value>
<dictionary>
<item>
<key> <string>short_title</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>acquire_local_roles</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>content_icon</string> </key>
<value> <string>document.gif</string> </value>
</item>
<item>
<key> <string>content_meta_type</string> </key>
<value> <string>ERP5 Workflow</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>An ERP5 Workflow.</string> </value>
</item>
<item>
<key> <string>factory</string> </key>
<value> <string>addWorkflow</string> </value>
</item>
<item>
<key> <string>filter_content_types</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>group_list</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Workflow</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>type_class</string> </key>
<value> <string>Workflow</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>domain_name</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>property_name</string> </key>
<value> <string>short_title</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>domain_name</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>property_name</string> </key>
<value> <string>title</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_workflow/PortalTypeTemplateItem/portal_types/Worklist.xml deleted 100644 → 0
View file @ 9f0f514a
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Base Type" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>content_icon</string> </key>
<value> <string>document.gif</string> </value>
</item>
<item>
<key> <string>content_meta_type</string> </key>
<value> <string>ERP5 Worklist</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>\n
A ERP5 Worklist.\n
</string> </value>
</item>
<item>
<key> <string>factory</string> </key>
<value> <string>addWorklist</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Worklist</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/test_core/SkinTemplateItem/portal_skins/erp5_test.xml deleted 100644 → 0
View file @ 9f0f514a
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Folder" module="OFS.Folder"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_objects</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>erp5_test</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/test_core/SkinTemplateItem/portal_skins/erp5_test/test_file.xml deleted 100644 → 0
View file @ 9f0f514a
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="File" module="OFS.Image"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts54532722.5</string> </value>
</item>
<item>
<key> <string>__name__</string> </key>
<value> <string>test_file</string> </value>
</item>
<item>
<key> <string>content_type</string> </key>
<value> <string>text/x-unknown-content-type</string> </value>
</item>
<item>
<key> <string>data</string> </key>
<value> <string>test1\n
test2\n
test3</string> </value>
</item>
<item>
<key> <string>precondition</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>size</string> </key>
<value> <int>17</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/test_core/bt/template_skin_id_list deleted 100644 → 0
View file @ 9f0f514a
erp5_test
\ No newline at end of file
bt5/test_core/bt/title deleted 100644 → 0
View file @ 9f0f514a
test_core
\ No newline at end of file
bt5/test_core/bt/version deleted 100644 → 0
View file @ 9f0f514a
1.0
\ No newline at end of file
product/ERP5Type/Base.py
View file @ 262e68c3
...@@ -3383,6 +3383,7 @@ class Base( CopyContainer, ...@@ -3383,6 +3383,7 @@ class Base( CopyContainer,
workflow = self.portal_workflow.getWorkflowById(wf_id) workflow = self.portal_workflow.getWorkflowById(wf_id)
erp5workflow = self.workflow_module._getOb(wf_id, None) erp5workflow = self.workflow_module._getOb(wf_id, None)
LOG('zwj: Loading %s'%erp5workflow.getId(), WARNING,'updating roles')
if workflow is not None: if workflow is not None:
changed = workflow.updateRoleMappingsFor(self) changed = workflow.updateRoleMappingsFor(self)
if changed: if changed:
...@@ -3390,7 +3391,7 @@ class Base( CopyContainer, ...@@ -3390,7 +3391,7 @@ class Base( CopyContainer,
### zwj: update role changed through erp5workflow ### zwj: update role changed through erp5workflow
if erp5workflow is not None: if erp5workflow is not None:
changed = erp5workflow.updateRoleMappingFor(self) changed = erp5workflow.updateRoleMappingsFor(self)
if changed: if changed:
self.reindexObjectSecurity(activate_kw={'priority':4}) self.reindexObjectSecurity(activate_kw={'priority':4})
......
product/ERP5Type/ERP5Type.py
View file @ 262e68c3
...@@ -418,10 +418,10 @@ class ERP5TypeInformation(XMLObject, ...@@ -418,10 +418,10 @@ class ERP5TypeInformation(XMLObject,
for workflow in workflow_tool.getWorkflowsFor(ob): for workflow in workflow_tool.getWorkflowsFor(ob):
workflow.notifyCreated(ob) workflow.notifyCreated(ob)
for ERP5Workflow in self.getTypeERP5WorkflowList(): for ERP5Workflow_id in self.getTypeERP5WorkflowList():
workflow_module = portal.getDefaultModule(portal_type="Workflow") workflow_module = portal.getDefaultModule(portal_type="Workflow")
if workflow_module is not None: if workflow_module is not None:
ERP5Workflow = workflow_module._getOb(ERP5Workflow) ERP5Workflow = workflow_module._getOb(ERP5Workflow_id)
ERP5Workflow.initializeDocument(ob) ERP5Workflow.initializeDocument(ob)
if not temp_object: if not temp_object:
......
product/ERP5Workflow/Document/PermissionRoles.py
View file @ 262e68c3
...@@ -67,9 +67,12 @@ class PermissionRoles(XMLObject): ...@@ -67,9 +67,12 @@ class PermissionRoles(XMLObject):
return self.id return self.id
def getPermissionRole(self): def getPermissionRole(self):
permission = 'None'
role = 'None'
if self.is_selected == 1: if self.is_selected == 1:
permission_id = self.getId().split('_')[1] permission_id = int(self.id.split('_')[1])
role_id = self.getId().split('_')[2] role_id = int(self.id.split('_')[2])
LOG('zwj: Assign %s to %s' %(role_id, permission_id), WARNING, "in PermissionRole.")
permission_list = sorted(self.getParent().getParent().getManagedPermissionList()) permission_list = sorted(self.getParent().getParent().getManagedPermissionList())
role_list = sorted(["Anonymous", "Assignee", "Assignor", "Associate", role_list = sorted(["Anonymous", "Assignee", "Assignor", "Associate",
"Auditor", "Authenticated", "Author", "Manager", "Auditor", "Authenticated", "Author", "Manager",
...@@ -77,16 +80,6 @@ class PermissionRoles(XMLObject): ...@@ -77,16 +80,6 @@ class PermissionRoles(XMLObject):
permission = permission_list[permission_id] permission = permission_list[permission_id]
role = role_list[role_id] role = role_list[role_id]
LOG('zwj: Assign %s to %s' %(role, permission), WARNING, "in PermissionRole.") LOG('zwj: Assign %s to %s' %(role, permission), WARNING, "in PermissionRole.")
return permission, role if role == 'None':
role = ['Manager']
def setPermissionRoleMap(self): return permission, role
if is_selected == 1:
permission_id = self.id.split('_')[1]
role_id = self.id.split('_')[2]
permission_list = sorted(self.getParent().getParent().getManagedPermissionList())
role_list = sorted(["Anonymous", "Assignee", "Assignor", "Associate",
"Auditor", "Authenticated", "Author", "Manager",
"Member", "Owner", "Reviewer"])
permission = permission_list[permission_id]
role = role_list[role_id]
product/ERP5Workflow/Document/State.py
View file @ 262e68c3
...@@ -86,6 +86,8 @@ class State(XMLObject, XMLMatrix): ...@@ -86,6 +86,8 @@ class State(XMLObject, XMLMatrix):
raise StateError raise StateError
else: else:
transition.execute(document, form_kw=form_kw) transition.execute(document, form_kw=form_kw)
### zwj: update Role mapping, also in Workflow, initialiseDocument()
self.getParent().updateRoleMappingsFor(document)
def undoTransition(self, document): def undoTransition(self, document):
""" """
......
product/ERP5Workflow/Document/Workflow.py
View file @ 262e68c3
...@@ -42,6 +42,7 @@ from Products.DCWorkflowGraph.DCWorkflowGraph import bin_search, getGraph ...@@ -42,6 +42,7 @@ from Products.DCWorkflowGraph.DCWorkflowGraph import bin_search, getGraph
from Products.ERP5Type.Utils import UpperCase from Products.ERP5Type.Utils import UpperCase
from Acquisition import aq_base from Acquisition import aq_base
from DateTime import DateTime from DateTime import DateTime
from zLOG import LOG, ERROR, DEBUG, WARNING
class Workflow(XMLObject): class Workflow(XMLObject):
""" """
...@@ -56,10 +57,13 @@ class Workflow(XMLObject): ...@@ -56,10 +57,13 @@ class Workflow(XMLObject):
### zwj: for security issue ### zwj: for security issue
managed_permission = () managed_permission = ()
role = None managed_role = ()
group = () group = ()
erp5_permission_roles = {} # { permission: [role] or (role,) } erp5_permission_roles = {} # { permission: [role] or (role,) }
erp5_role_groups = ()
role_list = sorted(["Anonymous", "Assignee", "Assignor", "Associate",
"Auditor", "Authenticated", "Author", "Manager",
"Member", "Owner", "Reviewer"])
# Declarative security # Declarative security
security = ClassSecurityInfo() security = ClassSecurityInfo()
security.declareObjectProtected(Permissions.AccessContentsInformation) security.declareObjectProtected(Permissions.AccessContentsInformation)
...@@ -88,6 +92,8 @@ class Workflow(XMLObject): ...@@ -88,6 +92,8 @@ class Workflow(XMLObject):
for variable in variable_list: for variable in variable_list:
status_dict[variable.getTitle()] = variable.getInitialValue(object=object) status_dict[variable.getTitle()] = variable.getInitialValue(object=object)
self._updateWorkflowHistory(document, status_dict) self._updateWorkflowHistory(document, status_dict)
### zwj: initialize role mappings, also in State.py/executeTransition()
self.updateRoleMappingsFor(document)
def _generateHistoryKey(self): def _generateHistoryKey(self):
""" """
...@@ -184,15 +190,18 @@ class Workflow(XMLObject): ...@@ -184,15 +190,18 @@ class Workflow(XMLObject):
### zwj: build a permission roles dict ### zwj: build a permission roles dict
for perm_role in permission_role_matrix_cells: for perm_role in permission_role_matrix_cells:
permission,role = perm_role.getPermissionRole() permission,role = perm_role.getPermissionRole()
if erp5_permission_roles[permission]: LOG('zwj: Assign %s to %s' %(role, permission), WARNING, "in Workflow.")
erp5_permission_roles[permission] = erp5_permission_roles[permission] + role if permission != 'None':
else: if self.erp5_permission_roles.has_key(permission):
erp5_permission_roles.update({permission : role}) self.erp5_permission_roles[permission] += (role,)
else:
self.erp5_permission_roles.update({permission : (role,)})
### zwj: update role list to permission ### zwj: update role list to permission
for permission_roles in erp5_permission_roles.keys(): for permission_roles in self.erp5_permission_roles.keys():
if modifyRolesForPermission(document, permission_roles, erp5_permission_roles[permission_roles]): if modifyRolesForPermission(document, permission_roles, self.erp5_permission_roles[permission_roles]):
changed = 1 changed = 1
"""
# Update the group -> role map. # Update the group -> role map.
groups = self.getGroups() groups = self.getGroups()
managed_roles = self.getRoles() managed_roles = self.getRoles()
...@@ -203,8 +212,11 @@ class Workflow(XMLObject): ...@@ -203,8 +212,11 @@ class Workflow(XMLObject):
roles = sdef.group_roles.get(group, ()) roles = sdef.group_roles.get(group, ())
if modifyRolesForGroup(document, group, roles, managed_roles): if modifyRolesForGroup(document, group, roles, managed_roles):
changed = 1 changed = 1
"""
return changed return changed
def getRoleList(self):
return self.role_list
def _checkTransitionGuard(self, t, document, **kw): def _checkTransitionGuard(self, t, document, **kw):
guard = t.guard guard = t.guard
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7