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

bt5/erp5_dms/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml

@@ -9,7 +9,7 @@
  </chain>
  <chain>
   <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>
   <type>File</type>
@@ -37,6 +37,6 @@
  </chain>
  <chain>
   <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>
 </workflow_chain>
\ No newline at end of file

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/ExternalDocument_view/external_processing_status_message.xml

@@ -279,7 +279,7 @@
       <dictionary>
         <item>
             <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>
       </dictionary>
     </pickle>

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_view.xml

@@ -115,7 +115,6 @@
                         <string>my_translated_validation_state_title</string>
                         <string>my_source_reference</string>
                         <string>external_processing_status_message</string>
-                        <string>consistency_state</string>
                       </list>
                     </value>
                 </item>

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/OOoDocument_view/external_processing_status_message.xml

@@ -279,7 +279,7 @@
       <dictionary>
         <item>
             <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>
       </dictionary>
     </pickle>

bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/scripts/checkValidity.xml

@@ -81,11 +81,10 @@ res = ob.checkConsistency()\n
 if res:\n
   msg= \'The document is not consistent:<br/>\'\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
 else:\n
-  pass\n
-  #state_change.kwargs.set(\'consistency_state\',\'good\')\n
+  context.portal_workflow.doActionFor(ob, \'process\', comment=\'consistency ok\')\n
 
 
 ]]></string> </value>
@@ -137,6 +136,7 @@ else:\n
                             <string>ob</string>
                             <string>res</string>
                             <string>msg</string>
+                            <string>context</string>
                           </tuple>
                         </value>
                     </item>

bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/scripts/invalidateDocument.xml

@@ -74,7 +74,7 @@ we have to \'uncheck\' its consistency flag\n
 so that you know you have to check it again\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>
         </item>
         <item>
@@ -124,7 +124,6 @@ state_change.new_state.addVariable(\'consistency_state\', \'not checked\')\n
                         <value>
                           <tuple>
                             <string>state_change</string>
-                            <string>_getattr_</string>
                           </tuple>
                         </value>
                     </item>

bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/states/draft.xml

@@ -163,16 +163,7 @@
         <item>
             <key> <string>_container</string> </key>
             <value>
-              <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>
+              <dictionary/>
             </value>
         </item>
       </dictionary>

bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/variables/consistency_state.xml → bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/processing_status_workflow.xml

@@ -4,8 +4,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
+          <string>Products.DCWorkflow.DCWorkflow</string>
+          <string>DCWorkflowDefinition</string>
         </tuple>
         <none/>
       </tuple>
@@ -19,40 +19,52 @@
             </value>
         </item>
         <item>
-            <key> <string>default_expr</string> </key>
+            <key> <string>_objects</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>default_value</string> </key>
-            <value> <string></string> </value>
+            <key> <string>creation_guard</string> </key>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <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>
-            <key> <string>for_catalog</string> </key>
-            <value> <int>1</int> </value>
+            <key> <string>groups</string> </key>
+            <value>
+              <tuple/>
+            </value>
         </item>
         <item>
-            <key> <string>for_status</string> </key>
-            <value> <int>1</int> </value>
+            <key> <string>id</string> </key>
+            <value> <string>processing_status_workflow</string> </value>
         </item>
         <item>
-            <key> <string>id</string> </key>
-            <value> <string>consistency_state</string> </value>
+            <key> <string>initial_state</string> </key>
+            <value> <string>current</string> </value>
         </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>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>update_always</string> </key>
-            <value> <int>0</int> </value>
+            <key> <string>state_var</string> </key>
+            <value> <string>external_processing_state</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>External processing workflow</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_dms/bt/change_log

+2007-02-03
+Reimplemented again, to use processing status workflow for everything.
+
 2007-01-29
 Reimplemented validation flag as publication workflow variable.
 

bt5/erp5_dms/bt/revision

-492
\ No newline at end of file
+494
\ No newline at end of file

bt5/erp5_dms/bt/template_portal_type_workflow_chain_list

@@ -9,7 +9,7 @@ External Library File | external_document_publication_workflow
 External Web Page | edit_workflow
 External Web Page | external_document_interaction_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 | document_publication_workflow
 File | edit_workflow
@@ -37,6 +37,6 @@ Spreadsheet | ooo_interaction_workflow
 Text | dms_file_interaction_workflow
 Text | document_publication_workflow
 Text | edit_workflow
-Text | external_processing_workflow
 Text | local_permission_interaction_workflow
 Text | ooo_interaction_workflow
+Text | processing_status_workflow
\ No newline at end of file

bt5/erp5_dms/bt/template_workflow_id_list

@@ -3,6 +3,6 @@ document_publication_workflow
 document_staging_workflow
 external_document_interaction_workflow
 external_document_publication_workflow
-external_processing_workflow
 local_permission_interaction_workflow
 ooo_interaction_workflow
+processing_status_workflow
\ No newline at end of file