Merge component_interaction_workflow into dynamic_class_generation_interaction_workflow.

This avoids having two interaction workflow for resetting dynamic classes and modules.

product/ERP5/bootstrap/erp5_core/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml

@@ -73,7 +73,7 @@
  </chain>
  <chain>
   <type>Component Tool</type>
-  <workflow>component_interaction_workflow</workflow>
+  <workflow>dynamic_class_generation_interaction_workflow</workflow>
  </chain>
  <chain>
   <type>Content Existence Constraint</type>
@@ -89,7 +89,7 @@
  </chain>
  <chain>
   <type>Document Component</type>
-  <workflow>component_interaction_workflow, component_validation_workflow, edit_workflow</workflow>
+  <workflow>component_validation_workflow, dynamic_class_generation_interaction_workflow, edit_workflow</workflow>
  </chain>
  <chain>
   <type>Dynamic Category Property</type>
@@ -97,7 +97,7 @@
  </chain>
  <chain>
   <type>Extension Component</type>
-  <workflow>component_interaction_workflow, component_validation_workflow, edit_workflow</workflow>
+  <workflow>component_validation_workflow, dynamic_class_generation_interaction_workflow, edit_workflow</workflow>
  </chain>
  <chain>
   <type>Mapped Value</type>

product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/component_interaction_workflow.xml

-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="InteractionWorkflowDefinition" module="Products.ERP5.InteractionWorkflow"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_objects</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>creation_guard</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>groups</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>component_interaction_workflow</string> </value>
-        </item>
-        <item>
-            <key> <string>manager_bypass</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string>Component Interaction Workflow</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>

product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/component_interaction_workflow/interactions.xml

-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Interaction" module="Products.ERP5.Interaction"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_mapping</string> </key>
-            <value>
-              <dictionary/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_objects</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>interactions</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>

product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/component_interaction_workflow/scripts.xml

-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_mapping</string> </key>
-            <value>
-              <dictionary/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_objects</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>scripts</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>

product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/component_interaction_workflow/variables.xml

-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Variables" module="Products.DCWorkflow.Variables"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_mapping</string> </key>
-            <value>
-              <dictionary/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>variables</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>

product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/component_interaction_workflow/worklists.xml

-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_mapping</string> </key>
-            <value>
-              <dictionary/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>worklists</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>

product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/component_interaction_workflow/interactions/ComponentTool_reset.xml → product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow/interactions/ComponentTool_reset.xml

@@ -34,13 +34,13 @@
             <key> <string>before_commit_script_name</string> </key>
             <value>
               <list>
-                <string>reset</string>
+                <string>ComponentTool_reset</string>
               </list>
             </value>
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>When a Component is deleted or added in Component Tool, reset all Components</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>

product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/component_interaction_workflow/interactions/Component_modify.xml → product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow/interactions/Component_modify.xml

@@ -40,7 +40,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>Before the reference, version or source code of a Component is modified, the Component is set to modified state, and at the end if the Consistency checks do not return any error, it is set to validated state. </string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>

product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/component_interaction_workflow/interactions/Component_reset.xml → product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow/interactions/Component_reset.xml

@@ -34,13 +34,13 @@
             <key> <string>before_commit_script_name</string> </key>
             <value>
               <list>
-                <string>reset</string>
+                <string>ComponentTool_reset</string>
               </list>
             </value>
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value> <string>When a Component is validated or invalidated, all loaded Components are reset</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>

product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/component_interaction_workflow/scripts/reset.xml → product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow/scripts/ComponentTool_reset.xml

@@ -67,7 +67,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>reset</string> </value>
+            <value> <string>ComponentTool_reset</string> </value>
         </item>
       </dictionary>
     </pickle>

product/ERP5/bootstrap/erp5_core/bt/change_log

+2012-02-25 arnaud.fontaine
+* Merge component_interaction_workflow into dynamic_class_generation_interaction_workflow.
+
 2012-02-25 arnaud.fontaine
 * Remove useless DocumentConstraint Property Sheet for Document Component.
 

product/ERP5/bootstrap/erp5_core/bt/revision

-41008
+41009
\ No newline at end of file

product/ERP5/bootstrap/erp5_core/bt/template_portal_type_workflow_chain_list

@@ -19,16 +19,16 @@ Category Related Membership Arity Constraint | dynamic_class_generation_interact
 Category Related Membership State Constraint | dynamic_class_generation_interaction_workflow
 Category Tool | dynamic_class_generation_interaction_workflow
 Category | edit_workflow
-Component Tool | component_interaction_workflow
+Component Tool | dynamic_class_generation_interaction_workflow
 Content Existence Constraint | dynamic_class_generation_interaction_workflow
 Distributed Ram Cache | distributed_ram_cache_interaction_workflow
-Document Component | component_interaction_workflow
 Document Component | component_validation_workflow
+Document Component | dynamic_class_generation_interaction_workflow
 Document Component | edit_workflow
 Document | edit_workflow
 Dynamic Category Property | dynamic_class_generation_interaction_workflow
-Extension Component | component_interaction_workflow
 Extension Component | component_validation_workflow
+Extension Component | dynamic_class_generation_interaction_workflow
 Extension Component | edit_workflow
 Mapped Value | edit_workflow
 Memcached Plugin | memcached_plugin_interaction_workflow

product/ERP5/bootstrap/erp5_core/bt/template_workflow_id_list

 base_type_interaction_workflow
 business_template_building_workflow
 business_template_installation_workflow
-component_interaction_workflow
 component_validation_workflow
 distributed_ram_cache_interaction_workflow
 dynamic_class_generation_interaction_workflow

product/ERP5Type/mixin/component.py

@@ -62,11 +62,12 @@ class RecordablePropertyMetaClass(ExtensionClass):
         """
         Everytime either 'reference', 'version' or 'text_content' are modified
         when a Component is in modified or validated state, the Component is
-        set to modified state by component interaction workflow, then in this
-        method, the current property value is recorded in order to handle any
-        error returned when checking consistency before the new value is
-        set. At the end, through component interaction workflow, the Component
-        is validated only if checkConsistency returns no error
+        set to modified state by dynamic class generation interaction
+        workflow, then in this method, the current property value is recorded
+        in order to handle any error returned when checking consistency before
+        the new value is set. At the end, through dynamic class generation
+        interaction workflow, the Component is validated only if
+        checkConsistency returns no error
 
         The recorded property will be used upon loading the Component whereas
         the new value set is displayed in Component view.