ERP5Workflow: rename initial_value to default_value

and dynamic_varible to dynamic_variable

bt5/erp5_configurator_maxma_demo/PathTemplateItem/workflow_module/maxma_demo_configuration_workflow/42.xml

@@ -39,7 +39,7 @@
             <value> <string>42</string> </value>
         </item>
         <item>
-            <key> <string>initial_value</string> </key>
+            <key> <string>default_value</string> </key>
             <value> <string>python: member.getUserName()</string> </value>
         </item>
         <item>

bt5/erp5_configurator_maxma_demo/PathTemplateItem/workflow_module/maxma_demo_configuration_workflow/43.xml

@@ -39,7 +39,7 @@
             <value> <string>43</string> </value>
         </item>
         <item>
-            <key> <string>initial_value</string> </key>
+            <key> <string>default_value</string> </key>
             <value> <string>python: object.getDateTime()</string> </value>
         </item>
         <item>

bt5/erp5_configurator_maxma_demo/PathTemplateItem/workflow_module/maxma_demo_configuration_workflow/44.xml

@@ -39,7 +39,7 @@
             <value> <string>44</string> </value>
         </item>
         <item>
-            <key> <string>initial_value</string> </key>
+            <key> <string>default_value</string> </key>
             <value> <string>python: None</string> </value>
         </item>
         <item>

bt5/erp5_configurator_maxma_demo/PathTemplateItem/workflow_module/maxma_demo_configuration_workflow/45.xml

@@ -39,7 +39,7 @@
             <value> <string>45</string> </value>
         </item>
         <item>
-            <key> <string>initial_value</string> </key>
+            <key> <string>default_value</string> </key>
             <value> <string>python: None</string> </value>
         </item>
         <item>

bt5/erp5_configurator_maxma_demo/PathTemplateItem/workflow_module/maxma_demo_configuration_workflow/46.xml

@@ -39,7 +39,7 @@
             <value> <string>46</string> </value>
         </item>
         <item>
-            <key> <string>initial_value</string> </key>
+            <key> <string>default_value</string> </key>
             <value> <string>python: request.get(\'configuration_save_url\', None)</string> </value>
         </item>
         <item>

bt5/erp5_configurator_maxma_demo/PathTemplateItem/workflow_module/maxma_demo_configuration_workflow/47.xml

@@ -60,7 +60,7 @@
             <value> <string>47</string> </value>
         </item>
         <item>
-            <key> <string>initial_value</string> </key>
+            <key> <string>default_value</string> </key>
             <value>
               <none/>
             </value>

bt5/erp5_configurator_maxma_demo/PathTemplateItem/workflow_module/maxma_demo_configuration_workflow/52.xml

@@ -37,7 +37,7 @@
             <value> <string>52</string> </value>
         </item>
         <item>
-            <key> <string>initial_value</string> </key>
+            <key> <string>default_value</string> </key>
             <value> <string>python: request.get(\'client_id\', None)</string> </value>
         </item>
         <item>

bt5/erp5_configurator_maxma_demo/PathTemplateItem/workflow_module/maxma_demo_configuration_workflow/59.xml

@@ -39,7 +39,7 @@
             <value> <string>59</string> </value>
         </item>
         <item>
-            <key> <string>initial_value</string> </key>
+            <key> <string>default_value</string> </key>
             <value> <string>python: request.get(\'transition\', None)</string> </value>
         </item>
         <item>

bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testWorklist.py

@@ -145,7 +145,7 @@ class TestWorklist(testWorkflowMixin):
 
       for worklist_variable_key, worklist_variable_value in kw.iteritems():
         worklist_variable = worklist_value.newContent(portal_type='Worklist Variable',
-                                                      initial_value=worklist_variable_value,
+                                                      default_value=worklist_variable_value,
                                                       reference=worklist_variable_key)
         if isinstance(worklist_variable_value, str) and worklist_variable_value.startswith('python'):
           worklist_variable.setDefaultExpression(worklist_variable_value)

bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/TransitionVariable_view.xml

@@ -84,7 +84,7 @@
                     <value>
                       <list>
                         <string>my_causality</string>
-                        <string>my_initial_value</string>
+                        <string>my_default_value</string>
                         <string>my_default_expression</string>
                       </list>
                     </value>

bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/TransitionVariable_view/my_initial_value.xml → bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/TransitionVariable_view/my_default_value.xml

@@ -8,7 +8,7 @@
       <dictionary>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>my_initial_value</string> </value>
+            <value> <string>my_default_value</string> </value>
         </item>
         <item>
             <key> <string>message_values</string> </key>

bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Variable_view.xml

@@ -92,7 +92,7 @@
                         <string>my_for_catalog</string>
                         <string>my_for_status</string>
                         <string>my_automatic_update</string>
-                        <string>my_initial_value</string>
+                        <string>my_default_value</string>
                         <string>my_default_expression</string>
                       </list>
                     </value>

bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Variable_view/my_initial_value.xml → bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Variable_view/my_default_value.xml

@@ -8,7 +8,7 @@
       <dictionary>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>my_initial_value</string> </value>
+            <value> <string>my_default_value</string> </value>
         </item>
         <item>
             <key> <string>message_values</string> </key>

bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/WorklistVariable_view.xml

@@ -84,7 +84,7 @@
                     <value>
                       <list>
                         <string>my_reference</string>
-                        <string>my_initial_value</string>
+                        <string>my_default_value</string>
                         <string>my_default_expression</string>
                       </list>
                     </value>

bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/WorklistVariable_view/my_initial_value.xml → bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/WorklistVariable_view/my_default_value.xml

@@ -8,7 +8,7 @@
       <dictionary>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>my_initial_value</string> </value>
+            <value> <string>my_default_value</string> </value>
         </item>
         <item>
             <key> <string>message_values</string> </key>

product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Variable/initial_value_property.xml → product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Variable/default_value_property.xml

@@ -37,7 +37,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>initial_value_property</string> </value>
+            <value> <string>default_value_property</string> </value>
         </item>
         <item>
             <key> <string>mode</string> </key>

product/ERP5Workflow/Document/ConfigurationTransition.py

@@ -87,13 +87,13 @@ class ConfigurationTransition(XMLObject):
         if variable_title in form_kw:
            status_dict[variable_title] = form_kw[variable_title]
         else:
-          status_dict[variable_title] = variable.getInitialValue(object=object)
+          status_dict[variable_title] = variable.getDefaultValue(object=object)
 
     # Update all transition variables
     if form_kw is not None:
       object.REQUEST.other.update(form_kw)
     for variable in self.contentValues(portal_type='Transition Variable'):
-      status_dict[variable.getCausalityTitle()] = variable.getInitialValue(object=object)
+      status_dict[variable.getCausalityTitle()] = variable.getDefaultValue(object=object)
 
     workflow._updateWorkflowHistory(document, status_dict)
 

product/ERP5Workflow/Document/ConfigurationWorkflow.py

@@ -78,7 +78,7 @@ class ConfigurationWorkflow(XMLObject):
     status_dict = {state_bc_id: self.getSource()}
     variable_list = self.contentValues(portal_type='Variable')
     for variable in variable_list:
-      status_dict[variable.getTitle()] = variable.getInitialValue(object=object)
+      status_dict[variable.getTitle()] = variable.getDefaultValue(object=object)
     self._updateWorkflowHistory(document, status_dict)
 
   def _generateHistoryKey(self):

product/ERP5Workflow/Document/InteractionWorkflow.py

@@ -148,7 +148,7 @@ class InteractionWorkflow(IdAsReferenceMixin("", "prefix"), Workflow):
       ec = createExprContext(StateChangeInfo(ob, self, status))
       value = Expression(default_expression)(ec)
     else:
-      value = vdef.getInitialValue()
+      value = vdef.getDefaultValue()
 
     return value
 
@@ -290,7 +290,7 @@ class InteractionWorkflow(IdAsReferenceMixin("", "prefix"), Workflow):
           if default_expression is not None:
             expression = Expression(default_expression)
           else:
-            value = vdef.getInitialValue()
+            value = vdef.getDefaultValue()
         if expression is not None:
           # Evaluate an expression.
           if econtext is None:
@@ -482,9 +482,9 @@ class InteractionWorkflow(IdAsReferenceMixin("", "prefix"), Workflow):
           property_value = vdef.getAutomaticUpdate()
           sub_object = SubElement(variable, property_id, attrib=dict(type='int'))
         elif property_id == 'default_value':
-          property_value = vdef.getInitialValue()
-          if vdef.getInitialValue() is not None:
-            property_value = vdef.getInitialValue()
+          property_value = vdef.getDefaultValue()
+          if vdef.getDefaultValue() is not None:
+            property_value = vdef.getDefaultValue()
           sub_object = SubElement(variable, property_id, attrib=dict(type='string'))
         else:
           property_value = vdef.getProperty(property_id)

product/ERP5Workflow/Document/Workflow.py

@@ -439,7 +439,7 @@ class Workflow(IdAsReferenceMixin("", "prefix"), XMLObject):
           ec = createExprContext(StateChangeInfo(ob, self, status))
           value = Expression(default_expression)(ec)
       else:
-          value = vdef.getInitialValue()
+          value = vdef.getDefaultValue()
 
       return value
 
@@ -664,7 +664,7 @@ class Workflow(IdAsReferenceMixin("", "prefix"), XMLObject):
         if vdef.getDefaultExpression() is not None:
           expr = vdef.getDefaultExpression()
         else:
-          value = vdef.getInitialValue(object=object)
+          value = vdef.getDefaultValue(object=object)
       if expr is not None and expr != '':
         # Evaluate an expression.
         if econtext is None:
@@ -914,9 +914,9 @@ class Workflow(IdAsReferenceMixin("", "prefix"), XMLObject):
           property_value = vdef.getAutomaticUpdate()
           sub_object = SubElement(variable, property_id, attrib=dict(type='int'))
         elif property_id == 'default_value':
-          property_value = vdef.getInitialValue()
-          if vdef.getInitialValue() is not None:
-            property_value = vdef.getInitialValue()
+          property_value = vdef.getDefaultValue()
+          if vdef.getDefaultValue() is not None:
+            property_value = vdef.getDefaultValue()
           sub_object = SubElement(variable, property_id, attrib=dict(type='string'))
         else:
           property_value = vdef.getProperty(property_id)
@@ -1065,7 +1065,7 @@ class Workflow(IdAsReferenceMixin("", "prefix"), XMLObject):
         if default_expression is not None:
           expr = Expression(default_expression)
         else:
-          value = vdef.getInitialValue()
+          value = vdef.getDefaultValue()
       if expr is not None:
         # Evaluate an expression.
         if econtext is None:
@@ -1123,7 +1123,7 @@ class Workflow(IdAsReferenceMixin("", "prefix"), XMLObject):
                   # convert string to expression before execute it.
                   value = Expression(default_expression)(ec)
               else:
-                  value = vdef.getInitialValue()
+                  value = vdef.getDefaultValue()
       if hasattr(self, 'getSourceValue'):
         if self.getSourceValue() is not None:
           initial_state = self.getSourceValue().getReference()

product/ERP5Workflow/Document/Worklist.py

@@ -145,7 +145,7 @@ class Worklist(IdAsReferenceMixin("worklist_", "prefix"), XMLObject):
           worklist_variable_value = self.newContent(portal_type='Worklist Variable')
           worklist_variable_value.setReference(variable_value_ref)
           worklist_variable_value.setDefaultExpression(variable_value.getDefaultExpression())
-          worklist_variable_value.setInitialValue(variable_value.getInitialValue())
+          worklist_variable_value.setDefaultValue(variable_value.getDefaultValue())
           res.append(worklist_variable_value)
         if worklist_variable_value and worklist_variable_value not in res and variable_value.getForCatalog() == 1:
           res.append(worklist_variable_value)
@@ -174,7 +174,7 @@ class Worklist(IdAsReferenceMixin("worklist_", "prefix"), XMLObject):
         if self.getMatchedCausalityState() is not None:
           key_list.append('causality_state')
         for dynamic_variable in self.objectValues():
-          if dynamic_variable.getInitialValue() or dynamic_variable.getDefaultExpression():
+          if dynamic_variable.getDefaultValue() or dynamic_variable.getDefaultExpression():
             key_list.append(dynamic_variable.getReference())
         return key_list
 
@@ -202,12 +202,12 @@ class Worklist(IdAsReferenceMixin("worklist_", "prefix"), XMLObject):
           matches = tuple(matches_ref_list)
         elif id:
           # Local dynamic variable:
-          dynamic_varible = self._getOb('variable_'+id)
-          if dynamic_varible.getInitialValue():
-            matches = [dynamic_varible.getInitialValue()]
+          dynamic_variable = self._getOb('variable_'+id)
+          if dynamic_variable.getDefaultValue():
+            matches = [dynamic_variable.getDefaultValue()]
           # Override initial value if expression set:
-          if dynamic_varible.getDefaultExpression():
-            matches = Expression(dynamic_varible.getDefaultExpression())
+          if dynamic_variable.getDefaultExpression():
+            matches = Expression(dynamic_variable.getDefaultExpression())
 
         if matches is not [] and matches is not None:
           if not isinstance(matches, (tuple, Expression)):

product/ERP5Workflow/Tool/WorkflowTool.py

@@ -405,12 +405,13 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
                 worklist.setMatchedCausalityState(state_id)
               else:
                 # dynamic variable.
-                worklist_variable_value = worklist.newContent(portal_type='Worklist Variable')
-                worklist_variable_value.setReference(key)
+                worklist_variable_value = worklist.newContent(portal_type='Worklist Variable',
+                                                              reference=key)
                 if isinstance(values, Expression):
                   worklist_variable_value.setDefaultExpression(values.text)
                 else:
-                  worklist_variable_value.InitialValue(value)
+                  worklist_variable_value.setDefaultValue(values)
+
             worklist.setActboxUrl(qdef.actbox_url)
             worklist.setActboxCategory(qdef.actbox_category)
             worklist.setActboxIcon(qdef.actbox_icon)
@@ -503,8 +504,6 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
           if getattr(variable_definition, 'default_expr', None) is not None:
             # for a very specific case, action return the reference of transition
             # in order to generation correct workflow history.
-            LOG("### workflow:", INFO, workflow)
-            LOG("### variable_definition:", INFO, variable_definition)
             if variable_id == 'action':
               variable.setDefaultExpression('transition/getReference|nothing')
             else:
@@ -519,7 +518,7 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
               variable.setExpression(tdef.info_guard.expr.text)
           variable.setForCatalog(variable_definition.for_catalog)
           variable.setForStatus(variable_definition.for_status)
-          variable.setInitialValue(variable_definition.default_value)
+          variable.setDefaultValue(variable_definition.default_value)
           variable.setDescription(variable_definition.description)
         # Configure transition variable:
         if getattr(dc_workflow, 'transitions', None) is not None:
@@ -1111,8 +1110,10 @@ def groupWorklistListByCondition(worklist_dict, sql_catalog, getSecurityUidDictA
   # One entry per worklist group, based on filter criterions.
   worklist_set_dict = {}
   metadata_dict = {}
+
   for workflow_id, worklist in worklist_dict.iteritems():
     for worklist_id, worklist_match_dict in worklist.iteritems():
+      # creates keys for new 'metadata' dict
       workflow_worklist_key = '/'.join((workflow_id, worklist_id))
       if getSecurityUidDictAndRoleColumnDict is None:
         valid_criterion_dict, metadata = getValidCriterionDict(
@@ -1167,6 +1168,7 @@ def groupWorklistListByCondition(worklist_dict, sql_catalog, getSecurityUidDictA
             worklist_set_dict=worklist_set_dict,
             workflow_worklist_key=workflow_worklist_key,
             valid_criterion_dict=valid_criterion_dict)
+
   return worklist_set_dict.values(), metadata_dict
 
 def generateNestedQuery(getQuery, priority_list, criterion_dict, possible_worklist_id_dict=None):
@@ -1281,16 +1283,15 @@ def generateActionList(worklist_metadata, worklist_result, portal_url):
   """
   action_list = []
   append = action_list.append
+
   for key, metadata in worklist_metadata.iteritems():
     document_count = worklist_result.get(key, 0)
     if document_count:
       format_data = metadata['format_data']
       format_data._push({'count': document_count})
-
       append({'name': metadata['worklist_title'] % format_data,
-              'url': portal_url if not metadata['action_box_url'] else \
-                     '%s/%s' % (portal_url,
-                                metadata['action_box_url'] % format_data),
+              'url': '%s/%s' % (portal_url,
+                                metadata['action_box_url'] or '' % format_data), #DCWorkflow were returning string 'None'
               'worklist_id': metadata['worklist_id'],
               'workflow_title': metadata['workflow_title'],
               'workflow_id': metadata['workflow_id'],