Skip to content

erp5
erp5
Commit 8d5d84d7 authored by Jean-Paul Smets's avatar Jean-Paul Smets
Browse files
Options

Changes made by JPS for customer. Multiple bug fixes 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@13374 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 3777619a
Show whitespace changes
Inline Side-by-side
Showing with 58 additions and 84 deletions
bt5/erp5_dms/ActionTemplateItem/portal_types/Image/file_upload.xml
View file @ 8d5d84d7
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</item> </item>
<item> <item>
<key> <string>priority</string> </key> <key> <string>priority</string> </key>
<value> <float>5.0</float> </value> <value> <float>25.0</float> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
......
bt5/erp5_dms/ActionTemplateItem/portal_types/Image/jump_to_similarity_cloud.xml
View file @ 8d5d84d7
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</item> </item>
<item> <item>
<key> <string>priority</string> </key> <key> <string>priority</string> </key>
<value> <float>1.0</float> </value> <value> <float>20.0</float> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
......
bt5/erp5_dms/ActionTemplateItem/portal_types/Image/jump_to_wiki_predecessor.xml
View file @ 8d5d84d7
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</item> </item>
<item> <item>
<key> <string>priority</string> </key> <key> <string>priority</string> </key>
<value> <float>10.0</float> </value> <value> <float>30.0</float> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
......
bt5/erp5_dms/ActionTemplateItem/portal_types/Image/view.xml
View file @ 8d5d84d7
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>text</string> </key> <key> <string>text</string> </key>
<value> <string>string:${object_url}/File_view</string> </value> <value> <string>string:${object_url}/Image_view</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_dms/CategoryTemplateItem/portal_categories/classification.xml
View file @ 8d5d84d7
...@@ -88,7 +88,9 @@ ...@@ -88,7 +88,9 @@
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string></string> </value> <value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>fallback_base_category</string> </key> <key> <string>fallback_base_category</string> </key>
......
bt5/erp5_dms/CategoryTemplateItem/portal_categories/publication_section.xml
View file @ 8d5d84d7
...@@ -30,6 +30,12 @@ ...@@ -30,6 +30,12 @@
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_tree</string> </key> <key> <string>_tree</string> </key>
<value> <value>
......
bt5/erp5_dms/PortalTypeTemplateItem/portal_types/Drawing.xml
View file @ 8d5d84d7
...@@ -83,6 +83,9 @@ ...@@ -83,6 +83,9 @@
<value> <value>
<tuple> <tuple>
<string>document</string> <string>document</string>
<string>file_document</string>
<string>recent_document</string>
<string>my_document</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_dms/PortalTypeTemplateItem/portal_types/PDF.xml
View file @ 8d5d84d7
...@@ -78,6 +78,9 @@ ...@@ -78,6 +78,9 @@
<value> <value>
<tuple> <tuple>
<string>document</string> <string>document</string>
<string>file_document</string>
<string>recent_document</string>
<string>my_document</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_dms/PortalTypeTemplateItem/portal_types/Presentation.xml
View file @ 8d5d84d7
...@@ -89,6 +89,9 @@ ...@@ -89,6 +89,9 @@
<value> <value>
<tuple> <tuple>
<string>document</string> <string>document</string>
<string>file_document</string>
<string>recent_document</string>
<string>my_document</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_dms/PortalTypeTemplateItem/portal_types/Spreadsheet.xml
View file @ 8d5d84d7
...@@ -83,6 +83,9 @@ ...@@ -83,6 +83,9 @@
<value> <value>
<tuple> <tuple>
<string>document</string> <string>document</string>
<string>file_document</string>
<string>recent_document</string>
<string>my_document</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_dms/PortalTypeTemplateItem/portal_types/Text.xml
View file @ 8d5d84d7
...@@ -83,6 +83,9 @@ ...@@ -83,6 +83,9 @@
<value> <value>
<tuple> <tuple>
<string>document</string> <string>document</string>
<string>file_document</string>
<string>recent_document</string>
<string>my_document</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_interaction_workflow/scripts/updateLocalRoles.xml
View file @ 8d5d84d7
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>state_change.object.updateLocalRolesOnSecurityGroups()\n <value> <string>state_change[\'object\'].updateLocalRolesOnSecurityGroups()\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
...@@ -87,6 +87,14 @@ ...@@ -87,6 +87,14 @@
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>state_change</string> </value> <value> <string>state_change</string> </value>
</item> </item>
<item>
<key> <string>_proxy_roles</string> </key>
<value>
<tuple>
<string>Manager</string>
</tuple>
</value>
</item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
<value> <value>
...@@ -113,6 +121,7 @@ ...@@ -113,6 +121,7 @@
<tuple> <tuple>
<string>state_change</string> <string>state_change</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>_getitem_</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow.xml
View file @ 8d5d84d7
...@@ -67,7 +67,6 @@ ...@@ -67,7 +67,6 @@
<string>Add portal content</string> <string>Add portal content</string>
<string>Modify portal content</string> <string>Modify portal content</string>
<string>Change local roles</string> <string>Change local roles</string>
<string>Change Images and Files</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/states/draft.xml
View file @ 8d5d84d7
...@@ -98,16 +98,9 @@ ...@@ -98,16 +98,9 @@
<key> <string>Add portal content</string> </key> <key> <string>Add portal content</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Manager</string> <string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>Change Images and Files</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Owner</string> <string>Owner</string>
</tuple> </tuple>
</value> </value>
...@@ -116,10 +109,8 @@ ...@@ -116,10 +109,8 @@
<key> <string>Change local roles</string> </key> <key> <string>Change local roles</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -128,6 +119,7 @@ ...@@ -128,6 +119,7 @@
<value> <value>
<tuple> <tuple>
<string>Assignee</string> <string>Assignee</string>
<string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string> <string>Owner</string>
</tuple> </tuple>
......
bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/variables/portal_type.xml deleted 100644 → 0
View file @ 3777619a
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.DCWorkflow.Variables</string>
<string>VariableDefinition</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>portal_type</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/worklists/docs_submitted_for_review.xml → bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/worklists/submitted_for_review.xml
View file @ 8d5d84d7
...@@ -30,19 +30,19 @@ ...@@ -30,19 +30,19 @@
</item> </item>
<item> <item>
<key> <string>actbox_name</string> </key> <key> <string>actbox_name</string> </key>
<value> <string>Documents for review (%(count)s)</string> </value> <value> <string>Documents submitted for review (%(count)s)</string> </value>
</item> </item>
<item> <item>
<key> <string>actbox_url</string> </key> <key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
document_module?simulation_state=submitted&local_roles=%(local_roles)s&reset=1&portal_type=Text&portal_type=Spreadsheet&portal_type=Presentation&portal_type=Drawing&portal_type=PDF&portal_type=File&portal_type=Image WebSite_viewAdvancedSearchResultList?validation_state=submitted&local_roles=%(local_roles)s&portal_type=%(portal_type)s&reset=1
]]></string> </value> ]]></string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string></string> </value> <value> <string>Documents submitted for review</string> </value>
</item> </item>
<item> <item>
<key> <string>guard</string> </key> <key> <string>guard</string> </key>
...@@ -52,7 +52,7 @@ document_module?simulation_state=submitted&local_roles=%(local_roles)s&reset=1&p ...@@ -52,7 +52,7 @@ document_module?simulation_state=submitted&local_roles=%(local_roles)s&reset=1&p
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>docs_submitted_for_review</string> </value> <value> <string>submitted_for_review</string> </value>
</item> </item>
<item> <item>
<key> <string>var_matches</string> </key> <key> <string>var_matches</string> </key>
...@@ -103,21 +103,7 @@ document_module?simulation_state=submitted&local_roles=%(local_roles)s&reset=1&p ...@@ -103,21 +103,7 @@ document_module?simulation_state=submitted&local_roles=%(local_roles)s&reset=1&p
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>validation_state</string> </key>
<value>
<tuple>
<string>Text</string>
<string>Spreadsheet</string>
<string>Presentation</string>
<string>Drawing</string>
<string>PDF</string>
<string>File</string>
<string>Image</string>
</tuple>
</value>
</item>
<item>
<key> <string>simulation_state</string> </key>
<value> <value>
<tuple> <tuple>
<string>submitted</string> <string>submitted</string>
......
bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/interactions/DocumentAssignRoles.xml
View file @ 8d5d84d7
...@@ -71,10 +71,16 @@ ...@@ -71,10 +71,16 @@
<key> <string>portal_type_filter</string> </key> <key> <string>portal_type_filter</string> </key>
<value> <value>
<list> <list>
<string>Drawing</string>
<string>File</string>
<string>Image</string>
<string>Organisation</string>
<string>PDF</string>
<string>Person</string> <string>Person</string>
<string>Presentation</string> <string>Presentation</string>
<string>Spreadsheet</string> <string>Spreadsheet</string>
<string>Text</string> <string>Text</string>
<string>Web Page</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/local_permission_interaction_workflow/scripts/Document_assignRoleToGroup.xml
View file @ 8d5d84d7
...@@ -68,9 +68,13 @@ ...@@ -68,9 +68,13 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>ob = sci[\'object\']\n <value> <string>"""\n
This script updates the local roles on the document.\n
It is called usually called after each update on\n
a document which follows classification based security.\n
"""\n
ob = sci[\'object\']\n
ob.assignRoleToSecurityGroup()\n ob.assignRoleToSecurityGroup()\n
ob.log(\'assigned\')\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
......
bt5/erp5_dms/bt/revision
View file @ 8d5d84d7
561 572
\ No newline at end of file \ No newline at end of file
bt5/erp5_dms/bt/template_catalog_method_id_list
View file @ 8d5d84d7
erp5_mysql/z0_drop_email
erp5_mysql/z0_uncatalog_email
erp5_mysql/z_catalog_compatibility_list
erp5_mysql/z_catalog_email_list
erp5_mysql/z_create_compatibility
erp5_mysql/z_create_email
\ No newline at end of file
bt5/erp5_dms/bt/template_path_list
View file @ 8d5d84d7
portal_categories/function/knowledge
portal_categories/function/knowledge/contributor
portal_categories/function/knowledge/manager
\ No newline at end of file
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