Skip to content

erp5
erp5
Commit bd0026e0 authored by Bartek Górny's avatar Bartek Górny
Browse files
Options

Reimplemented recording of validation state again, to use processing status... 

Reimplemented recording of validation state again, to use processing status workflow for it (because this is a better way, and because adding a workflow variable broke Base_viewHistory report).

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@12537 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 617d19ac
Show whitespace changes
Inline Side-by-side
Showing with 90 additions and 313 deletions
bt5/erp5_dms/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
View file @ bd0026e0
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
</chain> </chain>
<chain> <chain>
<type>External Web Page</type> <type>External Web Page</type>
<workflow>edit_workflow, external_processing_workflow, external_document_publication_workflow, external_document_interaction_workflow</workflow> <workflow>processing_status_workflow, edit_workflow, external_document_publication_workflow, external_document_interaction_workflow</workflow>
</chain> </chain>
<chain> <chain>
<type>File</type> <type>File</type>
...@@ -37,6 +37,6 @@ ...@@ -37,6 +37,6 @@
</chain> </chain>
<chain> <chain>
<type>Text</type> <type>Text</type>
<workflow>document_publication_workflow, ooo_interaction_workflow, dms_file_interaction_workflow, external_processing_workflow, local_permission_interaction_workflow, edit_workflow</workflow> <workflow>processing_status_workflow, document_publication_workflow, ooo_interaction_workflow, dms_file_interaction_workflow, local_permission_interaction_workflow, edit_workflow</workflow>
</chain> </chain>
</workflow_chain> </workflow_chain>
\ No newline at end of file
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ExternalDocument_view/external_processing_status_message.xml
View file @ bd0026e0
...@@ -279,7 +279,7 @@ ...@@ -279,7 +279,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: here.portal_workflow.getInfoFor(ob=here, name=\'history\', wf_id=\'external_processing_workflow\')[-1][\'comment\']</string> </value> <value> <string>python: here.portal_workflow.getInfoFor(ob=here, name=\'history\', wf_id=\'processing_status_workflow\')[-1][\'comment\']</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_view.xml
View file @ bd0026e0
...@@ -115,7 +115,6 @@ ...@@ -115,7 +115,6 @@
<string>my_translated_validation_state_title</string> <string>my_translated_validation_state_title</string>
<string>my_source_reference</string> <string>my_source_reference</string>
<string>external_processing_status_message</string> <string>external_processing_status_message</string>
<string>consistency_state</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_view/consistency_state.xml deleted 100644 → 0
View file @ 617d19ac
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.Formulator.StandardFields</string>
<string>StringField</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>consistency_state</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
<item>
<key> <string>required_not_found</string> </key>
<value> <string>Input is required but no input given.</string> </value>
</item>
<item>
<key> <string>too_long</string> </key>
<value> <string>Too much input was given.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_maxwidth</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_width</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>truncate</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_maxwidth</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_width</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>truncate</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_maxwidth</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_width</string> </key>
<value> <int>20</int> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Consistency</string> </value>
</item>
<item>
<key> <string>truncate</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <int>0</int> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.Formulator.TALESField</string>
<string>TALESMethod</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: here.portal_workflow.getInfoFor(ob=here, name=\'consistency_state\', wf_id=\'document_publication_workflow\') or \'not checked\'</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_view/external_processing_status_message.xml
View file @ bd0026e0
...@@ -279,7 +279,7 @@ ...@@ -279,7 +279,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: here.portal_workflow.getInfoFor(ob=here, name=\'comment\', wf_id=\'external_processing_workflow\')</string> </value> <value> <string>python: here.portal_workflow.getInfoFor(ob=here, name=\'comment\', wf_id=\'processing_status_workflow\')</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/scripts/checkValidity.xml
View file @ bd0026e0
...@@ -81,11 +81,10 @@ res = ob.checkConsistency()\n ...@@ -81,11 +81,10 @@ res = ob.checkConsistency()\n
if res:\n if res:\n
msg= \'The document is not consistent:<br/>\'\n msg= \'The document is not consistent:<br/>\'\n
msg += \'<br/>\'.join(\'- \' + str(r.message) for r in res)\n msg += \'<br/>\'.join(\'- \' + str(r.message) for r in res)\n
#state_change.kwargs.set(\'consistency_state\',\'missing\')\n context.portal_workflow.doActionFor(ob, \'process\', comment=\'consistency check failed\')\n
raise ValidationFailed(msg)\n raise ValidationFailed(msg)\n
else:\n else:\n
pass\n context.portal_workflow.doActionFor(ob, \'process\', comment=\'consistency ok\')\n
#state_change.kwargs.set(\'consistency_state\',\'good\')\n
]]></string> </value> ]]></string> </value>
...@@ -137,6 +136,7 @@ else:\n ...@@ -137,6 +136,7 @@ else:\n
<string>ob</string> <string>ob</string>
<string>res</string> <string>res</string>
<string>msg</string> <string>msg</string>
<string>context</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/scripts/invalidateDocument.xml
View file @ bd0026e0
...@@ -74,7 +74,7 @@ we have to \'uncheck\' its consistency flag\n ...@@ -74,7 +74,7 @@ we have to \'uncheck\' its consistency flag\n
so that you know you have to check it again\n so that you know you have to check it again\n
"""\n """\n
\n \n
state_change.new_state.addVariable(\'consistency_state\', \'not checked\')\n #state_change.new_state.addVariable(\'consistency_state\', \'not checked\')\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
...@@ -124,7 +124,6 @@ state_change.new_state.addVariable(\'consistency_state\', \'not checked\')\n ...@@ -124,7 +124,6 @@ state_change.new_state.addVariable(\'consistency_state\', \'not checked\')\n
<value> <value>
<tuple> <tuple>
<string>state_change</string> <string>state_change</string>
<string>_getattr_</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/states/draft.xml
View file @ bd0026e0
...@@ -163,16 +163,7 @@ ...@@ -163,16 +163,7 @@
<item> <item>
<key> <string>_container</string> </key> <key> <string>_container</string> </key>
<value> <value>
<dictionary> <dictionary/>
<item>
<key> <string>comment</string> </key>
<value> <string>uuuuuuuuuuu</string> </value>
</item>
<item>
<key> <string>consistency_state</string> </key>
<value> <string>good</string> </value>
</item>
</dictionary>
</value> </value>
</item> </item>
</dictionary> </dictionary>
......
bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/variables/consistency_state.xml → bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/processing_status_workflow.xml
View file @ bd0026e0
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
<pickle> <pickle>
<tuple> <tuple>
<tuple> <tuple>
<string>Products.DCWorkflow.Variables</string> <string>Products.DCWorkflow.DCWorkflow</string>
<string>VariableDefinition</string> <string>DCWorkflowDefinition</string>
</tuple> </tuple>
<none/> <none/>
</tuple> </tuple>
...@@ -19,40 +19,52 @@ ...@@ -19,40 +19,52 @@
</value> </value>
</item> </item>
<item> <item>
<key> <string>default_expr</string> </key> <key> <string>_objects</string> </key>
<value> <value>
<none/> <tuple/>
</value> </value>
</item> </item>
<item> <item>
<key> <string>default_value</string> </key> <key> <string>creation_guard</string> </key>
<value> <string></string> </value> <value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string></string> </value> <value> <string>A one-state workflow (similar to edit_workflow), for recording and displaying external processing messages</string> </value>
</item> </item>
<item> <item>
<key> <string>for_catalog</string> </key> <key> <string>groups</string> </key>
<value> <int>1</int> </value> <value>
<tuple/>
</value>
</item> </item>
<item> <item>
<key> <string>for_status</string> </key> <key> <string>id</string> </key>
<value> <int>1</int> </value> <value> <string>processing_status_workflow</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>initial_state</string> </key>
<value> <string>consistency_state</string> </value> <value> <string>current</string> </value>
</item> </item>
<item> <item>
<key> <string>info_guard</string> </key> <key> <string>manager_bypass</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value> <value>
<none/> <tuple/>
</value> </value>
</item> </item>
<item> <item>
<key> <string>update_always</string> </key> <key> <string>state_var</string> </key>
<value> <int>0</int> </value> <value> <string>external_processing_state</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>External processing workflow</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_dms/bt/change_log
View file @ bd0026e0
2007-02-03
Reimplemented again, to use processing status workflow for everything.
2007-01-29 2007-01-29
Reimplemented validation flag as publication workflow variable. Reimplemented validation flag as publication workflow variable.
......
bt5/erp5_dms/bt/revision
View file @ bd0026e0
492 494
\ No newline at end of file \ No newline at end of file
bt5/erp5_dms/bt/template_portal_type_workflow_chain_list
View file @ bd0026e0
...@@ -9,7 +9,7 @@ External Library File | external_document_publication_workflow ...@@ -9,7 +9,7 @@ External Library File | external_document_publication_workflow
External Web Page | edit_workflow External Web Page | edit_workflow
External Web Page | external_document_interaction_workflow External Web Page | external_document_interaction_workflow
External Web Page | external_document_publication_workflow External Web Page | external_document_publication_workflow
External Web Page | external_processing_workflow External Web Page | processing_status_workflow
File | dms_file_interaction_workflow File | dms_file_interaction_workflow
File | document_publication_workflow File | document_publication_workflow
File | edit_workflow File | edit_workflow
...@@ -37,6 +37,6 @@ Spreadsheet | ooo_interaction_workflow ...@@ -37,6 +37,6 @@ Spreadsheet | ooo_interaction_workflow
Text | dms_file_interaction_workflow Text | dms_file_interaction_workflow
Text | document_publication_workflow Text | document_publication_workflow
Text | edit_workflow Text | edit_workflow
Text | external_processing_workflow
Text | local_permission_interaction_workflow Text | local_permission_interaction_workflow
Text | ooo_interaction_workflow Text | ooo_interaction_workflow
Text | processing_status_workflow
\ No newline at end of file
bt5/erp5_dms/bt/template_workflow_id_list
View file @ bd0026e0
...@@ -3,6 +3,6 @@ document_publication_workflow ...@@ -3,6 +3,6 @@ document_publication_workflow
document_staging_workflow document_staging_workflow
external_document_interaction_workflow external_document_interaction_workflow
external_document_publication_workflow external_document_publication_workflow
external_processing_workflow
local_permission_interaction_workflow local_permission_interaction_workflow
ooo_interaction_workflow ooo_interaction_workflow
processing_status_workflow
\ 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