diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/interactions/DocumentAssignRoles.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/interactions/DocumentAssignRoles.xml deleted file mode 100644 index 1e2b4dd2a154493fd0f7b26b0b8569462c2aed0d..0000000000000000000000000000000000000000 --- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/interactions/DocumentAssignRoles.xml +++ /dev/null @@ -1,100 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="InteractionDefinition" module="Products.ERP5.Interaction"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>actbox_category</string> </key> - <value> <string>workflow</string> </value> - </item> - <item> - <key> <string>actbox_name</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>actbox_url</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>activate_script_name</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>after_script_name</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>before_commit_script_name</string> </key> - <value> - <list> - <string>updateLocalRoles</string> - </list> - </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>guard</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>DocumentAssignRoles</string> </value> - </item> - <item> - <key> <string>method_id</string> </key> - <value> - <list> - <string>_set.*</string> - <string>submit</string> - </list> - </value> - </item> - <item> - <key> <string>once_per_transaction</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>portal_type_filter</string> </key> - <value> - <list> - <string>Drawing</string> - <string>File</string> - <string>Image</string> - <string>PDF</string> - <string>Presentation</string> - <string>Spreadsheet</string> - <string>Text</string> - <string>Web Page</string> - </list> - </value> - </item> - <item> - <key> <string>script_name</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>trigger_type</string> </key> - <value> <int>2</int> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/interactions/Document_setContributor.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/interactions/Document_setContributor.xml index 6ec500ff87c8d3725bf68d2f700f0da7a4bb3c08..638d48abf70df6e706ca474328703614f45cab86 100644 --- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/interactions/Document_setContributor.xml +++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/interactions/Document_setContributor.xml @@ -56,6 +56,7 @@ <key> <string>method_id</string> </key> <value> <list> + <string>_edit</string> <string>_set*</string> </list> </value> @@ -67,18 +68,7 @@ <item> <key> <string>portal_type_filter</string> </key> <value> - <list> - <string>Discussion Post</string> - <string>Discussion Thread</string> - <string>Drawing</string> - <string>File</string> - <string>Image</string> - <string>PDF</string> - <string>Presentation</string> - <string>Spreadsheet</string> - <string>Text</string> - <string>Web Page</string> - </list> + <none/> </value> </item> <item> @@ -87,6 +77,10 @@ <tuple/> </value> </item> + <item> + <key> <string>temporary_document_disallowed</string> </key> + <value> <int>1</int> </value> + </item> <item> <key> <string>title</string> </key> <value> <string></string> </value> diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/interactions/Document_edit.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/interactions/Document_updateLocalRoles.xml similarity index 90% rename from bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/interactions/Document_edit.xml rename to bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/interactions/Document_updateLocalRoles.xml index 69477ad119dcac98ba8312530e20b6964dc681ee..d300dfba2695491464ce68e95613f514bcff5fed 100644 --- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/interactions/Document_edit.xml +++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/document_security_interaction_workflow/interactions/Document_updateLocalRoles.xml @@ -27,15 +27,15 @@ <item> <key> <string>after_script_name</string> </key> <value> - <list> - <string>updateLocalRoles</string> - </list> + <tuple/> </value> </item> <item> <key> <string>before_commit_script_name</string> </key> <value> - <tuple/> + <list> + <string>updateLocalRoles</string> + </list> </value> </item> <item> @@ -50,13 +50,14 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>Document_edit</string> </value> + <value> <string>Document_updateLocalRoles</string> </value> </item> <item> <key> <string>method_id</string> </key> <value> <list> <string>_edit</string> + <string>_set.*</string> <string>submit</string> </list> </value> @@ -77,6 +78,10 @@ <tuple/> </value> </item> + <item> + <key> <string>temporary_document_disallowed</string> </key> + <value> <int>1</int> </value> + </item> <item> <key> <string>title</string> </key> <value> <string></string> </value> diff --git a/bt5/erp5_base/bt/change_log b/bt5/erp5_base/bt/change_log index 21f01667d9f27efbd780350fba77643703e11b5d..8cb272683b1aed8c7e6a43864f540b7c737f553e 100644 --- a/bt5/erp5_base/bt/change_log +++ b/bt5/erp5_base/bt/change_log @@ -1,3 +1,6 @@ +2011-03-02 Kazuhiko +* cleanup document_security_interaction_workflow. + 2011-01-04 Ivan * Add upgrader alarm that is able to handle migration of embedded "File" & "Image" objects to "Embedded File" portal type diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision index 71ed48c5f3971c2b0c79c239d04f961d0af78e53..0c8ddea6abfa06b1f51fd4fcf54d75011361201f 100644 --- a/bt5/erp5_base/bt/revision +++ b/bt5/erp5_base/bt/revision @@ -1 +1 @@ -954 \ No newline at end of file +955 \ No newline at end of file