Skip to content

erp5
erp5
Commit b8e27caf authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

core: use lines fields for workflow views 

Instead of add-hoc ", ".join
parent 77969151
Pipeline #25240 passed with stage
    in 0 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 74 additions and 288 deletions
    product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/InteractionWorkflow_view.xml
    View file @ b8e27caf
    ......@@ -71,10 +71,10 @@
    <value>
    <list>
    <string>interaction_listbox_trigger_method_id_list</string>
    <string>interaction_listbox_after_script_id_list</string>
    <string>interaction_listbox_before_script_id_list</string>
    <string>interaction_listbox_before_commit_script_id_list</string>
    <string>interaction_listbox_activate_script_id_list</string>
    <string>interaction_listbox_after_script_reference_list</string>
    <string>interaction_listbox_before_script_reference_list</string>
    <string>interaction_listbox_before_commit_script_reference_list</string>
    <string>interaction_listbox_activate_script_reference_list</string>
    <string>interaction_listbox_guard_role_list</string>
    </list>
    </value>
    ......
    product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/InteractionWorkflow_view/interaction_listbox.xml
    View file @ b8e27caf
    ......@@ -10,6 +10,7 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>all_columns</string>
    <string>columns</string>
    <string>portal_types</string>
    <string>selection_name</string>
    ......@@ -75,6 +76,41 @@
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>all_columns</string> </key>
    <value>
    <list>
    <tuple>
    <string>guard_expression</string>
    <string>Guard Expression</string>
    </tuple>
    <tuple>
    <string>guard_group_list</string>
    <string>Guard Group</string>
    </tuple>
    <tuple>
    <string>guard_permission_list</string>
    <string>Guard Permission</string>
    </tuple>
    <tuple>
    <string>portal_type_filter_list</string>
    <string>Portal Type Filter</string>
    </tuple>
    <tuple>
    <string>portal_type_filter_group_list</string>
    <string>Portal Type Group Filter</string>
    </tuple>
    <tuple>
    <string>temporary_document_disallowed</string>
    <string>Do not Trigger on a Temporary Document</string>
    </tuple>
    <tuple>
    <string>trigger_once_per_transaction</string>
    <string>Trigger once per Transaction</string>
    </tuple>
    </list>
    </value>
    </item>
    <item>
    <key> <string>columns</string> </key>
    <value>
    ......@@ -96,19 +132,19 @@
    <string>Required Roles</string>
    </tuple>
    <tuple>
    <string>before_script_id_list</string>
    <string>before_script_reference_list</string>
    <string>Before Script</string>
    </tuple>
    <tuple>
    <string>after_script_id_list</string>
    <string>after_script_reference_list</string>
    <string>After Script</string>
    </tuple>
    <tuple>
    <string>before_commit_script_id_list</string>
    <string>before_commit_script_reference_list</string>
    <string>Script (End of Transaction)</string>
    </tuple>
    <tuple>
    <string>activate_script_id_list</string>
    <string>activate_script_reference_list</string>
    <string>Activities (Later)</string>
    </tuple>
    <tuple>
    ......
    product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/InteractionWorkflow_view/interaction_listbox_activate_script_id_list.xml → product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/InteractionWorkflow_view/interaction_listbox_activate_script_reference_list.xml
    View file @ b8e27caf
    ......@@ -9,14 +9,12 @@
    <item>
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>default</string>
    </list>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>interaction_listbox_activate_script_id_list</string> </value>
    <value> <string>interaction_listbox_activate_script_reference_list</string> </value>
    </item>
    <item>
    <key> <string>message_values</string> </key>
    ......@@ -48,12 +46,6 @@
    <key> <string>tales</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string></string> </value>
    ......@@ -69,13 +61,9 @@
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_string_field</string> </value>
    <value> <string>my_lines_field</string> </value>
    </item>
    <item>
    <key> <string>form_id</string> </key>
    ......@@ -87,17 +75,4 @@
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="TALESMethod" module="Products.Formulator.TALESField"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_text</string> </key>
    <value> <string>python: \', \'.join(cell.getActivateScriptIdList())</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Workflow_viewTransitionList/listbox_after_script_list.xml → product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/InteractionWorkflow_view/interaction_listbox_after_script_reference_list.xml
    View file @ b8e27caf
    ......@@ -9,14 +9,12 @@
    <item>
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>default</string>
    </list>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>listbox_after_script_list</string> </value>
    <value> <string>interaction_listbox_after_script_reference_list</string> </value>
    </item>
    <item>
    <key> <string>message_values</string> </key>
    ......@@ -48,12 +46,6 @@
    <key> <string>tales</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string></string> </value>
    ......@@ -69,13 +61,9 @@
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_string_field</string> </value>
    <value> <string>my_lines_field</string> </value>
    </item>
    <item>
    <key> <string>form_id</string> </key>
    ......@@ -87,17 +75,4 @@
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="TALESMethod" module="Products.Formulator.TALESField"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_text</string> </key>
    <value> <string>python: \', \'.join(cell.getAfterScriptReferenceList())</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/InteractionWorkflow_view/interaction_listbox_before_commit_script_id_list.xml → product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/InteractionWorkflow_view/interaction_listbox_before_commit_script_reference_list.xml
    View file @ b8e27caf
    ......@@ -9,14 +9,12 @@
    <item>
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>default</string>
    </list>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>interaction_listbox_before_commit_script_id_list</string> </value>
    <value> <string>interaction_listbox_before_commit_script_reference_list</string> </value>
    </item>
    <item>
    <key> <string>message_values</string> </key>
    ......@@ -48,12 +46,6 @@
    <key> <string>tales</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string></string> </value>
    ......@@ -69,13 +61,9 @@
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_string_field</string> </value>
    <value> <string>my_lines_field</string> </value>
    </item>
    <item>
    <key> <string>form_id</string> </key>
    ......@@ -87,17 +75,4 @@
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="TALESMethod" module="Products.Formulator.TALESField"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_text</string> </key>
    <value> <string>python: \', \'.join(cell.getBeforeCommitScriptIdList())</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Workflow_viewTransitionList/listbox_before_script_list.xml → product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/InteractionWorkflow_view/interaction_listbox_before_script_reference_list.xml
    View file @ b8e27caf
    ......@@ -9,14 +9,12 @@
    <item>
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>default</string>
    </list>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>listbox_before_script_list</string> </value>
    <value> <string>interaction_listbox_before_script_reference_list</string> </value>
    </item>
    <item>
    <key> <string>message_values</string> </key>
    ......@@ -48,12 +46,6 @@
    <key> <string>tales</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string></string> </value>
    ......@@ -69,13 +61,9 @@
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_string_field</string> </value>
    <value> <string>my_lines_field</string> </value>
    </item>
    <item>
    <key> <string>form_id</string> </key>
    ......@@ -87,17 +75,4 @@
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="TALESMethod" module="Products.Formulator.TALESField"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_text</string> </key>
    <value> <string>python: \', \'.join(cell.getBeforeScriptReferenceList())</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/InteractionWorkflow_view/interaction_listbox_guard_role_list.xml
    View file @ b8e27caf
    ......@@ -9,9 +9,7 @@
    <item>
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>default</string>
    </list>
    <list/>
    </value>
    </item>
    <item>
    ......@@ -48,12 +46,6 @@
    <key> <string>tales</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string></string> </value>
    ......@@ -69,13 +61,9 @@
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_string_field</string> </value>
    <value> <string>my_lines_field</string> </value>
    </item>
    <item>
    <key> <string>form_id</string> </key>
    ......@@ -87,17 +75,4 @@
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="TALESMethod" module="Products.Formulator.TALESField"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_text</string> </key>
    <value> <string>python: \', \'.join(cell.getGuardRoleList())</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/InteractionWorkflow_view/interaction_listbox_trigger_method_id_list.xml
    View file @ b8e27caf
    ......@@ -9,9 +9,7 @@
    <item>
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>default</string>
    </list>
    <list/>
    </value>
    </item>
    <item>
    ......@@ -48,12 +46,6 @@
    <key> <string>tales</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string></string> </value>
    ......@@ -69,13 +61,9 @@
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_string_field</string> </value>
    <value> <string>my_lines_field</string> </value>
    </item>
    <item>
    <key> <string>form_id</string> </key>
    ......@@ -87,17 +75,4 @@
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="TALESMethod" module="Products.Formulator.TALESField"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_text</string> </key>
    <value> <string>python: \', \'.join(cell.getTriggerMethodIdList())</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Workflow_view/state_listbox_destination_title_list.xml
    View file @ b8e27caf
    ......@@ -9,9 +9,7 @@
    <item>
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>default</string>
    </list>
    <list/>
    </value>
    </item>
    <item>
    ......@@ -48,12 +46,6 @@
    <key> <string>tales</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string></string> </value>
    ......@@ -69,13 +61,9 @@
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_string_field</string> </value>
    <value> <string>my_lines_field</string> </value>
    </item>
    <item>
    <key> <string>form_id</string> </key>
    ......@@ -87,17 +75,4 @@
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="TALESMethod" module="Products.Formulator.TALESField"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_text</string> </key>
    <value> <string>python: \', \'.join(cell.getDestinationTitleList())</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Workflow_viewTransitionList.xml
    View file @ b8e27caf
    ......@@ -81,8 +81,8 @@
    <list>
    <string>listbox_trigger_type</string>
    <string>listbox_guard_role_list</string>
    <string>listbox_before_script_list</string>
    <string>listbox_after_script_list</string>
    <string>listbox_before_script_reference_list</string>
    <string>listbox_after_script_reference_list</string>
    </list>
    </value>
    </item>
    ......
    product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Workflow_viewTransitionList/listbox.xml
    View file @ b8e27caf
    ......@@ -101,11 +101,11 @@
    <string>Guard Roles</string>
    </tuple>
    <tuple>
    <string>before_script_list</string>
    <string>before_script_reference_list</string>
    <string>Before Script</string>
    </tuple>
    <tuple>
    <string>after_script_list</string>
    <string>after_script_reference_list</string>
    <string>After Script</string>
    </tuple>
    </list>
    ......
    product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/InteractionWorkflow_view/interaction_listbox_after_script_id_list.xml → product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Workflow_viewTransitionList/listbox_after_script_reference_list.xml
    View file @ b8e27caf
    ......@@ -9,14 +9,12 @@
    <item>
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>default</string>
    </list>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>interaction_listbox_after_script_id_list</string> </value>
    <value> <string>listbox_after_script_reference_list</string> </value>
    </item>
    <item>
    <key> <string>message_values</string> </key>
    ......@@ -48,12 +46,6 @@
    <key> <string>tales</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string></string> </value>
    ......@@ -69,13 +61,9 @@
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_string_field</string> </value>
    <value> <string>my_lines_field</string> </value>
    </item>
    <item>
    <key> <string>form_id</string> </key>
    ......@@ -87,17 +75,4 @@
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="TALESMethod" module="Products.Formulator.TALESField"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_text</string> </key>
    <value> <string>python: \', \'.join(cell.getAfterScriptIdList())</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/InteractionWorkflow_view/interaction_listbox_before_script_id_list.xml → product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Workflow_viewTransitionList/listbox_before_script_reference_list.xml
    View file @ b8e27caf
    ......@@ -9,14 +9,12 @@
    <item>
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>default</string>
    </list>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>interaction_listbox_before_script_id_list</string> </value>
    <value> <string>listbox_before_script_reference_list</string> </value>
    </item>
    <item>
    <key> <string>message_values</string> </key>
    ......@@ -48,12 +46,6 @@
    <key> <string>tales</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string></string> </value>
    ......@@ -69,13 +61,9 @@
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_string_field</string> </value>
    <value> <string>my_lines_field</string> </value>
    </item>
    <item>
    <key> <string>form_id</string> </key>
    ......@@ -87,17 +75,4 @@
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="TALESMethod" module="Products.Formulator.TALESField"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_text</string> </key>
    <value> <string>python: \', \'.join(cell.getBeforeScriptIdList())</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Workflow_viewTransitionList/listbox_guard_role_list.xml
    View file @ b8e27caf
    ......@@ -9,9 +9,7 @@
    <item>
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>default</string>
    </list>
    <list/>
    </value>
    </item>
    <item>
    ......@@ -48,12 +46,6 @@
    <key> <string>tales</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string></string> </value>
    ......@@ -69,13 +61,9 @@
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_string_field</string> </value>
    <value> <string>my_lines_field</string> </value>
    </item>
    <item>
    <key> <string>form_id</string> </key>
    ......@@ -87,17 +75,4 @@
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="TALESMethod" module="Products.Formulator.TALESField"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_text</string> </key>
    <value> <string>python: \', \'.join(cell.getGuardRoleList())</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    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