Skip to content

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

Rework 'mass workflow transition' 

In the first dialog you still select which action to do on which objects, now
you can only select one action. The second dialog is the actual dialog from the
workflow rendered on the context of one document from documents grouped by
state and portal type. This means that if the workflow uses a custom dialog to
set workflow variables, this dialog will be shown and the variables will be
passed to all documents.
Of course some workflows dialog fields have no meaning in a multi-document
transition, that's why there is a mass_workflow_action=True request parameter
to detect this situation and behave accordingly in such case.
parent 9b292489
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 832 additions and 643 deletions
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callDialogMethod.xml
View file @ 4a1af9c8
...@@ -267,9 +267,11 @@ if (not(can_redirect) or len(url_params_string) > 2000):\n ...@@ -267,9 +267,11 @@ if (not(can_redirect) or len(url_params_string) > 2000):\n
if deferred_portal_skin:\n if deferred_portal_skin:\n
request.set(\'deferred_portal_skin\', deferred_portal_skin)\n request.set(\'deferred_portal_skin\', deferred_portal_skin)\n
# and to cleanup formulator\'s special key in request\n # and to cleanup formulator\'s special key in request\n
for key in list(request.keys()):\n # XXX unless we are in Folder_modifyWorkflowStatus which validates again !\n
if key.startswith(\'field\') or key.startswith(\'subfield\'):\n if dialog_method != \'Folder_modifyWorkflowStatus\':\n
  • Tomáš Peterka @katomaso ·

    Maybe if you have to modify general-purpose script just to support your action ... maybe there is a better way of doing it

  • Jérome Perrin @jerome ·
    Owner

    This "exception" was made because "which form to use in validation" is dynamically selected.

    I have not tried too hard to make this use Base_callDialogMethod like other standard actions because it's a general-purpose action applying to all modules.

Please register or sign in to reply
request.form.pop(key, None)\n for key in list(request.keys()):\n
if key.startswith(\'field\') or key.startswith(\'subfield\'):\n
request.form.pop(key, None)\n
\n \n
# If we cannot redirect, then call the form directly.\n # If we cannot redirect, then call the form directly.\n
dialog_form = getattr(context, dialog_method)\n dialog_form = getattr(context, dialog_method)\n
......
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getPossibleWorkflowActionItemList.xml
View file @ 4a1af9c8
...@@ -57,8 +57,9 @@ for action in context.portal_actions.listFilteredActionsFor(brain).get(\'workflo ...@@ -57,8 +57,9 @@ for action in context.portal_actions.listFilteredActionsFor(brain).get(\'workflo
if transition is not None:\n if transition is not None:\n
workflow_id = action[\'transition\'].aq_parent.aq_parent.getId()\n workflow_id = action[\'transition\'].aq_parent.aq_parent.getId()\n
if workflow_id == brain.workflow_id:\n if workflow_id == brain.workflow_id:\n
dialog_id = action[\'url\'].split(\'?\', 1)[0].split(\'/\')[-1]\n
item_list.append((Base_translateString(action[\'title\']),\n item_list.append((Base_translateString(action[\'title\']),\n
\'%s/%s\' % (workflow_id, action[\'id\'])))\n \'%s/%s/%s\' % (workflow_id, action[\'id\'], dialog_id)))\n
\n \n
return item_list\n return item_list\n
</string> </value> </string> </value>
......
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewWorkflowActionDocumentListDialog.xml → product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_validateFolderWorkflowActionDialog.xml
View file @ 4a1af9c8
...@@ -50,27 +50,22 @@ ...@@ -50,27 +50,22 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>selection_name = \'workflow_action_dialog_proxy_selection\'\n <value> <string>if len([choice for choice in editor.values() if choice[\'workflow_action\']]) == 1:\n
selection_tool = context.getPortalObject().portal_selections\n return True\n
\n \n
selection_tool.setSelectionParamsFor(selection_name,\n from Products.ERP5Type.Message import translateString\n
dict(proxy_form_id=form_id))\n # XXX listbox validator does not show the validation failed message, so use portal status message instead\n
\n container.REQUEST.set(\'portal_status_message\', translateString("You must select one action."))\n
  • Tomáš Peterka @katomaso ·

    Why user can select multiple actions when it is actually forbidden? Why there is not-that-helpful message?

  • Jérome Perrin @jerome ·
    Owner

    I don't see how we could prevent user from selecting multiple actions, but I might be missing your point.

    What's not possible is to select actions that use different dialog form for their workflow transitions. If we want to make this more user friendly, we could improve this by allowing users to execute together actions that would be using the same dialog.

Please register or sign in to reply
request = container.REQUEST\n return False\n
request.set(\'proxy_form_id\', form_id)\n
request.set(\'reset\', 1)\n
request.set(\'ignore_hide_rows\', 1)\n
\n
return context.Folder_viewWorkflowActionDocumentListDialogRenderer(REQUEST=request)\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>form_id=\'\', **kw</string> </value> <value> <string>editor, request</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>Folder_viewWorkflowActionDocumentListDialog</string> </value> <value> <string>Base_validateFolderWorkflowActionDialog</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_modifyWorkflowStatus.xml
View file @ 4a1af9c8
...@@ -50,36 +50,90 @@ ...@@ -50,36 +50,90 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>from Products.ERP5Type.Message import translateString\n <value> <string>from Products.Formulator.Errors import FormValidationError\n
from Products.ERP5Type.Message import translateString\n
portal = context.getPortalObject()\n
request = context.REQUEST\n
\n \n
if listbox is None:\n target_context = portal.restrictedTraverse(choosen_action[\'relative_url\'])\n
listbox = []\n target_form = getattr(target_context, choosen_action[\'workflow_action\'].split(\'/\')[-1])\n
\n \n
request = context.REQUEST\n real_form = getattr(context, dialog_id)\n
portal = context.getPortalObject()\n \n
# Validate the forms\n
for form in (real_form, target_form):\n
try:\n
# It is necessary to force editable_mode before validating\n
# data. Otherwise, field appears as non editable.\n
# This is the pending of form_dialog.\n
editable_mode = request.get(\'editable_mode\', 1)\n
request.set(\'editable_mode\', 1)\n
form.validate_all_to_request(request)\n
request.set(\'editable_mode\', editable_mode)\n
except FormValidationError, validation_errors:\n
# Pack errors into the request\n
field_errors = form.ErrorFields(validation_errors)\n
request.set(\'field_errors\', field_errors)\n
return real_form(request)\n
\n
# XXX: this is a duplication from form validation code in Base_callDialogMethod\n
# Correct fix is to factorise this script with Base_callDialogMethod, not to\n
# fix XXXs here.\n
do_action_for_param_dict = {}\n
MARKER = []\n
for f in form.get_fields():\n
k = f.id\n
v = getattr(request, k, MARKER)\n
if v is not MARKER:\n
if k.startswith(\'your_\'):\n
k=k[5:]\n
elif k.startswith(\'my_\'): # compat\n
k=k[3:]\n
do_action_for_param_dict[k] = v\n
\n
listbox = request.get(\'listbox\') # XXX: hardcoded field name\n
if listbox is not None:\n
listbox_line_list = []\n
listbox = getattr(request,\'listbox\',None) # XXX: hardcoded field name\n
listbox_keys = listbox.keys()\n
listbox_keys.sort()\n
for key in listbox_keys:\n
listbox_line = listbox[key]\n
listbox_line[\'listbox_key\'] = key\n
listbox_line_list.append(listbox[key])\n
listbox_line_list = tuple(listbox_line_list)\n
do_action_for_param_dict[\'listbox\'] = listbox_line_list # XXX: hardcoded field name\n
\n
assert \'workflow_action\' in do_action_for_param_dict\n
\n \n
# generate a random tag\n # generate a random tag\n
tag = \'folder_workflow_action_%s\' % random.randint(0, 1000)\n tag = \'folder_workflow_action_%s\' % random.randint(0, 1000)\n
\n \n
for parameters in listbox:\n # get the list of objects we are about to modify\n
doc = portal.restrictedTraverse(parameters[\'listbox_key\'])\n selection_uid_list = portal.portal_selections.getSelectionCheckedUidsFor(selection_name)\n
if same_type(parameters[\'workflow_action\'], \'\'):\n selection_params = portal.portal_selections.getSelectionParamsFor(selection_name).copy()\n
doc.activate(tag=tag).Base_workflowStatusModify(batch=1,\n selection_params[choosen_action[\'state_var\']] = choosen_action[\'workflow_state\']\n
workflow_action=parameters[\'workflow_action\'],\n selection_params[\'portal_type\'] = choosen_action[\'portal_type\']\n
workflow_id=parameters[\'workflow_id\'],\n if selection_uid_list:\n
comment=comment)\n selection_params[\'uid\'] = selection_uid_list\n
else:\n \n
for workflow_action, workflow_id in zip(\n path_list = [brain.path for brain in\n
parameters[\'workflow_action\'], parameters[\'workflow_id\']):\n portal.portal_selections.callSelectionFor(selection_name, params=selection_params)]\n
doc.activate(activity=\'SQLQueue\', tag=tag).Base_workflowStatusModify(batch=1,\n \n
workflow_action=workflow_action,\n batch_size = 100 # XXX\n
workflow_id=workflow_id,\n priority = 2 # XXX \n
comment=comment)\n path_list_len = len(path_list)\n
\n
for i in xrange(0, path_list_len, batch_size):\n
current_path_list = path_list[i:i+batch_size]\n
context.activate(activity=\'SQLQueue\', priority=priority, tag=tag).callMethodOnObjectList(\n
current_path_list, \'Base_workflowStatusModify\', batch_mode=True, **do_action_for_param_dict)\n
\n \n
# activate something on the module after everything, so that user can know that something is happening in the background\n # activate something on the module after everything, so that user can know that\n
# something is happening in the background\n
context.activate(after_tag=tag).getTitle()\n context.activate(after_tag=tag).getTitle()\n
\n \n
# reset selection checked uids\n # reset selection checked uids \n
context.portal_selections.setSelectionCheckedUidsFor(selection_name, [])\n context.portal_selections.setSelectionCheckedUidsFor(selection_name, [])\n
\n \n
return context.Base_redirect(form_id,\n return context.Base_redirect(form_id,\n
...@@ -88,7 +142,7 @@ return context.Base_redirect(form_id,\n ...@@ -88,7 +142,7 @@ return context.Base_redirect(form_id,\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>listbox=None, comment=\'\', form_id=\'view\', selection_name=\'\', **kw</string> </value> <value> <string>form_id, dialog_id, selection_name, choosen_action, **kw</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewWorkflowActionDialog.xml
View file @ 4a1af9c8
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</item> </item>
<item> <item>
<key> <string>action</string> </key> <key> <string>action</string> </key>
<value> <string>Folder_viewWorkflowActionDocumentListDialog</string> </value> <value> <string>Folder_viewWorkflowActionDialogSecondStep</string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
<key> <string>bottom</string> </key> <key> <string>bottom</string> </key>
<value> <value>
<list> <list>
<string>listbox</string> <string>workflow_action_listbox</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -81,10 +81,11 @@ ...@@ -81,10 +81,11 @@
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <value>
<list> <list>
<string>listbox_portal_type</string> <string>workflow_action_listbox_portal_type</string>
<string>listbox_state_var</string> <string>workflow_action_listbox_state_var</string>
<string>listbox_workflow_action</string> <string>workflow_action_listbox_workflow_action</string>
<string>listbox_workflow_state</string> <string>workflow_action_listbox_workflow_state</string>
<string>workflow_action_listbox_relative_url</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -92,8 +93,8 @@ ...@@ -92,8 +93,8 @@
<key> <string>left</string> </key> <key> <string>left</string> </key>
<value> <value>
<list> <list>
<string>your_comment</string>
<string>your_module_selection_name</string> <string>your_module_selection_name</string>
<string>your_enable_detail_list</string>
</list> </list>
</value> </value>
</item> </item>
......
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewWorkflowActionDialog/listbox.xml → product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewWorkflowActionDialog/workflow_action_listbox.xml
View file @ 4a1af9c8
...@@ -10,17 +10,18 @@ ...@@ -10,17 +10,18 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>title</string>
<string>columns</string> <string>columns</string>
<string>editable_columns</string>
<string>external_validator</string>
<string>list_method</string> <string>list_method</string>
<string>selection_name</string> <string>selection_name</string>
<string>editable_columns</string> <string>title</string>
</list> </list>
</value> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>listbox</string> </value> <value> <string>workflow_action_listbox</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -111,6 +112,10 @@ ...@@ -111,6 +112,10 @@
<string>workflow_state</string> <string>workflow_state</string>
<string></string> <string></string>
</tuple> </tuple>
<tuple>
<string>relative_url</string>
<string></string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
...@@ -134,9 +139,19 @@ ...@@ -134,9 +139,19 @@
<string>workflow_action</string> <string>workflow_action</string>
<string>Workflow Action</string> <string>Workflow Action</string>
</tuple> </tuple>
<tuple>
<string>relative_url</string>
<string>relative_url</string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>external_validator</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_view_mode_listbox</string> </value> <value> <string>my_view_mode_listbox</string> </value>
...@@ -148,7 +163,7 @@ ...@@ -148,7 +163,7 @@
<item> <item>
<key> <string>list_method</string> </key> <key> <string>list_method</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -170,6 +185,19 @@ ...@@ -170,6 +185,19 @@
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Method" module="Products.Formulator.MethodField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>Base_validateFolderWorkflowActionDialog</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<global name="Method" module="Products.Formulator.MethodField"/> <global name="Method" module="Products.Formulator.MethodField"/>
</pickle> </pickle>
......
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewWorkflowActionDialog/listbox_portal_type.xml → product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewWorkflowActionDialog/workflow_action_listbox_portal_type.xml
View file @ 4a1af9c8
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>listbox_portal_type</string> </value> <value> <string>workflow_action_listbox_portal_type</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewWorkflowActionDialog/listbox_state_var.xml → product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewWorkflowActionDialog/workflow_action_listbox_state_var.xml
View file @ 4a1af9c8
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>listbox_state_var</string> </value> <value> <string>workflow_action_listbox_state_var</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewWorkflowActionDialog/listbox_workflow_action.xml → product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewWorkflowActionDialog/workflow_action_listbox_workflow_action.xml
View file @ 4a1af9c8
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>listbox_workflow_action</string> </value> <value> <string>workflow_action_listbox_workflow_action</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewWorkflowActionDialog/listbox_workflow_state.xml → product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewWorkflowActionDialog/workflow_action_listbox_workflow_state.xml
View file @ 4a1af9c8
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>listbox_workflow_state</string> </value> <value> <string>workflow_action_listbox_workflow_state</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
......
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewWorkflowActionDialog/your_enable_detail_list.xml 0 → 100644
View file @ 4a1af9c8
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>your_enable_detail_list</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>
</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>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>title</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> <string></string> </value>
</item>
<item>
<key> <string>description</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>title</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> <int>0</int> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <int>1</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>title</string> </key>
<value> <string>Show Detailed List of Documents</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewWorkflowActionDocumentListDialogRenderer.xml → product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewWorkflowActionDialogSecondStep.xml
View file @ 4a1af9c8
...@@ -53,17 +53,15 @@ ...@@ -53,17 +53,15 @@
</item> </item>
<item> <item>
<key> <string>enctype</string> </key> <key> <string>enctype</string> </key>
<value> <string>multipart/form-data</string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>group_list</string> </key> <key> <string>group_list</string> </key>
<value> <value>
<list> <list>
<string>left</string> <string>left</string>
<string>right</string>
<string>center</string>
<string>bottom</string>
<string>hidden</string> <string>hidden</string>
<string>bottom</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -76,16 +74,9 @@ ...@@ -76,16 +74,9 @@
<value> <value>
<list> <list>
<string>listbox</string> <string>listbox</string>
<string>your_comment</string>
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item> <item>
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <value>
...@@ -101,18 +92,12 @@ ...@@ -101,18 +92,12 @@
<list/> <list/>
</value> </value>
</item> </item>
<item>
<key> <string>right</string> </key>
<value>
<list/>
</value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>Folder_viewWorkflowActionDocumentListDialogRenderer</string> </value> <value> <string>Folder_viewWorkflowActionDialogSecondStep</string> </value>
</item> </item>
<item> <item>
<key> <string>method</string> </key> <key> <string>method</string> </key>
...@@ -120,11 +105,11 @@ ...@@ -120,11 +105,11 @@
</item> </item>
<item> <item>
<key> <string>name</string> </key> <key> <string>name</string> </key>
<value> <string>Folder_viewWorkflowActionDocumentListDialog</string> </value> <value> <string>Folder_viewWorkflowActionDialog</string> </value>
</item> </item>
<item> <item>
<key> <string>pt</string> </key> <key> <string>pt</string> </key>
<value> <string>form_dialog</string> </value> <value> <string>folder_workflow_action_dialog</string> </value>
</item> </item>
<item> <item>
<key> <string>row_length</string> </key> <key> <string>row_length</string> </key>
......
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewWorkflowActionDocumentListDialogRenderer/listbox.xml → product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewWorkflowActionDialogSecondStep/listbox.xml
View file @ 4a1af9c8
...@@ -10,19 +10,25 @@ ...@@ -10,19 +10,25 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>lines</string>
<string>columns</string>
<string>all_columns</string> <string>all_columns</string>
<string>search_columns</string> <string>columns</string>
<string>sort_columns</string>
<string>list_method</string>
<string>count_method</string> <string>count_method</string>
<string>selection_name</string> <string>domain_root_list</string>
<string>domain_tree</string>
<string>editable</string>
<string>editable_columns</string>
<string>enabled</string>
<string>hide_rows_on_no_search_criterion</string>
<string>lines</string>
<string>list_method</string>
<string>report_root_list</string>
<string>report_tree</string>
<string>search</string> <string>search</string>
<string>search_columns</string>
<string>select</string> <string>select</string>
<string>editable_columns</string> <string>selection_name</string>
<string>sort_columns</string>
<string>stat_columns</string> <string>stat_columns</string>
<string>editable</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -78,10 +84,28 @@ ...@@ -78,10 +84,28 @@
<key> <string>count_method</string> </key> <key> <string>count_method</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>domain_root_list</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>domain_tree</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>editable_columns</string> </key> <key> <string>editable_columns</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>enabled</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -89,9 +113,13 @@ ...@@ -89,9 +113,13 @@
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value> </value>
</item> </item>
<item>
<key> <string>hide_rows_on_no_search_criterion</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>lines</string> </key> <key> <string>lines</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -100,6 +128,14 @@ ...@@ -100,6 +128,14 @@
<key> <string>list_method</string> </key> <key> <string>list_method</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>report_root_list</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>report_tree</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>search</string> </key> <key> <string>search</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -120,6 +156,10 @@ ...@@ -120,6 +156,10 @@
<key> <string>sort_columns</string> </key> <key> <string>sort_columns</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>stat_columns</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -164,6 +204,16 @@ ...@@ -164,6 +204,16 @@
<key> <string>count_method</string> </key> <key> <string>count_method</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>domain_root_list</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>domain_tree</string> </key>
<value> <int>0</int> </value>
</item>
<item> <item>
<key> <string>editable</string> </key> <key> <string>editable</string> </key>
<value> <int>1</int> </value> <value> <int>1</int> </value>
...@@ -183,6 +233,10 @@ ...@@ -183,6 +233,10 @@
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>listbox</string> </value> <value> <string>listbox</string> </value>
...@@ -191,6 +245,10 @@ ...@@ -191,6 +245,10 @@
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value> <value> <string>Base_viewFieldLibrary</string> </value>
</item> </item>
<item>
<key> <string>hide_rows_on_no_search_criterion</string> </key>
<value> <int>0</int> </value>
</item>
<item> <item>
<key> <string>lines</string> </key> <key> <string>lines</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
...@@ -198,9 +256,19 @@ ...@@ -198,9 +256,19 @@
<item> <item>
<key> <string>list_method</string> </key> <key> <string>list_method</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
</value>
</item>
<item>
<key> <string>report_root_list</string> </key>
<value>
<list/>
</value> </value>
</item> </item>
<item>
<key> <string>report_tree</string> </key>
<value> <int>0</int> </value>
</item>
<item> <item>
<key> <string>search</string> </key> <key> <string>search</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
...@@ -267,12 +335,25 @@ ...@@ -267,12 +335,25 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: context.portal_selections.getSelectionParamsFor(\'workflow_action_dialog_proxy_selection\').get(\'proxy_form_id\', \'Folder_viewContentList\')</string> </value> <value> <string>request/enable_detail_list | nothing</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="4" aka="AAAAAAAAAAQ="> <record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>request/form_id | string:Folder_viewContentList</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="5" aka="AAAAAAAAAAU=">
<pickle> <pickle>
<global name="Method" module="Products.Formulator.MethodField"/> <global name="Method" module="Products.Formulator.MethodField"/>
</pickle> </pickle>
......
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/folder_workflow_action_dialog.xml 0 → 100644
View file @ 4a1af9c8
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_text</string> </key>
<value> <unicode encoding="cdata"><![CDATA[
<tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n
xmlns:metal="http://xml.zope.org/namespaces/metal"\n
xmlns:i18n="http://xml.zope.org/namespaces/i18n">\n
<tal:block metal:define-macro="master">\n
<tal:block tal:define="local_parameter_list local_parameter_list | python: {};\n
choosen_action python: request.get(\'choosen_action\') or [x for x in request.get(\'workflow_action_listbox\').values() if x[\'workflow_action\']][0];\n
target_context python: context.getPortalObject().restrictedTraverse(choosen_action[\'relative_url\']);\n
target_form python: getattr(target_context, choosen_action[\'workflow_action\'].split(\'/\')[-1]);\n
dummy python: request.set(\'workflow_action\', choosen_action[\'workflow_action\'].split(\'/\')[1]);\n
dummy python: request.set(\'here\', here);\n
dummy python: request.set(\'mass_workflow_action\', True);\n
dummy python: request.set(\'button_title\', target_context.Base_getFormViewDialogActionButtonTitle(target_form));\n
dummy python: local_parameter_list.update({ \n
\'choosen_action\': choosen_action,\n
\'cancel_url\': request[\'cancel_url\'],\n
\'mass_workflow_action\': request[\'mass_workflow_action\'],\n
});">\n
<tal:block metal:use-macro="here/dialog_main/macros/master">\n
\n
<tal:block metal:define-macro="head">\n
<tal:block metal:fill-slot="head">\n
<tal:block tal:define="head_group python: form.get_fields_in_group(\'head\')">\n
<div tal:condition="python: len(head_group) > 0"\n
class="head">\n
<tal:block tal:repeat="field head_group">\n
<tal:block tal:condition="preferred_html_style_developper_mode">\n
<tal:block metal:use-macro="developper_shortcut_render/macros/field_developper" />\n
</tal:block>\n
<tal:block tal:define="field_description field/Field_getDescription"\n
tal:condition="preferred_html_style_translator_mode">\n
<tal:block metal:use-macro="developper_shortcut_render/macros/field_translator" />\n
</tal:block>\n
<tal:block tal:define="value python:request.get(field.id, None)"\n
tal:replace="structure python:field.render(value, request)" />\n
</tal:block>\n
</div>\n
</tal:block>\n
</tal:block>\n
</tal:block>\n
\n
<tal:block metal:fill-slot="main">\n
<tal:block tal:define="field_render here/field_render/macros/field_render;">\n
<tal:block tal:condition="preferred_html_style_developper_mode">\n
<tal:block metal:use-macro="developper_shortcut_render/macros/form" />\n
</tal:block>\n
\n
<div class="dialog_box">\n
\n
<tal:block metal:define-macro="content">\n
<div class="content"\n
tal:define="group_list target_form/Form_getGroupTitleAndId">\n
<tal:block tal:repeat="group group_list">\n
<tal:block tal:define="gid group/gid">\n
<fieldset tal:condition="python: \'hidden\' not in gid and \'bottom\' not in gid and \'head\' not in gid"\n
tal:attributes="class gid;">\n
<legend tal:content="group/gtitle" class="group_title" />\n
<tal:block tal:repeat="field python: target_form.get_fields_in_group(group[\'goid\'])">\n
<tal:block metal:use-macro="field_render"/>\n
</tal:block>\n
</fieldset>\n
</tal:block>\n
</tal:block>\n
<p class="clear"></p>\n
</div>\n
</tal:block>\n
</div>\n
</tal:block>\n
</tal:block>\n
\n
<tal:block metal:define-macro="bottom">\n
<tal:block metal:fill-slot="bottom">\n
<tal:block tal:repeat="form python: [target_form, form]">\n
<tal:block tal:define="bottom_group python: form.get_fields_in_group(\'bottom\')">\n
<div tal:condition="python: len(bottom_group) > 0"\n
class="bottom">\n
<tal:block tal:repeat="field bottom_group">\n
<tal:block tal:condition="preferred_html_style_developper_mode">\n
<tal:block metal:use-macro="developper_shortcut_render/macros/field_developper" />\n
</tal:block>\n
<tal:block tal:define="field_description field/Field_getDescription"\n
tal:condition="preferred_html_style_translator_mode">\n
<tal:block metal:use-macro="developper_shortcut_render/macros/field_translator" />\n
</tal:block>\n
<tal:block tal:define="value python:request.get(field.id, None)"\n
tal:replace="structure python:field.render(value, request)" />\n
</tal:block>\n
</div>\n
</tal:block>\n
</tal:block>\n
</tal:block>\n
</tal:block>\n
\n
\n
</tal:block>\n
</tal:block>\n
</tal:block>\n
</tal:block>
]]></unicode> </value>
</item>
<item>
<key> <string>content_type</string> </key>
<value> <string>text/html</string> </value>
</item>
<item>
<key> <string>expand</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>folder_workflow_action_dialog</string> </value>
</item>
<item>
<key> <string>output_encoding</string> </key>
<value> <string>iso-8859-15</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <unicode></unicode> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
product/ERP5/bootstrap/erp5_core/bt/revision
View file @ 4a1af9c8
41048 41049
\ No newline at end of file \ No newline at end of file
product/ERP5Form/Extensions/Folder_getWorkflowActionDocumentList.py
View file @ 4a1af9c8
...@@ -29,6 +29,9 @@ ...@@ -29,6 +29,9 @@
from Products.PythonScripts.standard import Object from Products.PythonScripts.standard import Object
# Some workflow does not make sense in the context of mass transition and are
# not proposed.
skipped_workflow_id_list = ['delivery_causality_workflow',]
def getDocumentGroupByWorkflowStateList(self, form_id='', **kw): def getDocumentGroupByWorkflowStateList(self, form_id='', **kw):
"""This returns the list of all "document groups", ie document of the same """This returns the list of all "document groups", ie document of the same
...@@ -81,6 +84,8 @@ def getDocumentGroupByWorkflowStateList(self, form_id='', **kw): ...@@ -81,6 +84,8 @@ def getDocumentGroupByWorkflowStateList(self, form_id='', **kw):
for brain in selection_tool.callSelectionFor(selection_name, params=params): for brain in selection_tool.callSelectionFor(selection_name, params=params):
doc = brain.getObject() doc = brain.getObject()
for workflow in wf_tool.getWorkflowsFor(doc): for workflow in wf_tool.getWorkflowsFor(doc):
if workflow.getId() in skipped_workflow_id_list:
continue
state_var = workflow.variables.getStateVar() state_var = workflow.variables.getStateVar()
translated_workflow_state_title = doc.getProperty( translated_workflow_state_title = doc.getProperty(
'translated_%s_title' % state_var) 'translated_%s_title' % state_var)
...@@ -111,6 +116,8 @@ def getDocumentGroupByWorkflowStateList(self, form_id='', **kw): ...@@ -111,6 +116,8 @@ def getDocumentGroupByWorkflowStateList(self, form_id='', **kw):
for document in selected_document_list: for document in selected_document_list:
for state_var in possible_state_list: for state_var in possible_state_list:
for workflow in wf_tool.getWorkflowsFor(document): for workflow in wf_tool.getWorkflowsFor(document):
if workflow.getId() in skipped_workflow_id_list:
continue
if state_var == workflow.variables.getStateVar(): if state_var == workflow.variables.getStateVar():
key = (document.getPortalTypeName(), workflow.getId(), key = (document.getPortalTypeName(), workflow.getId(),
document.getProperty(state_var)) document.getProperty(state_var))
...@@ -155,7 +162,7 @@ def getWorkflowActionDocumentList(self, **kw): ...@@ -155,7 +162,7 @@ def getWorkflowActionDocumentList(self, **kw):
"""This returns the list of all documents on which we will pass a workflow """This returns the list of all documents on which we will pass a workflow
transition. transition.
""" """
listbox = kw.get('listbox', None) listbox = kw.get('workflow_action_listbox', None)
if listbox is None: if listbox is None:
# if the listbox is empty # if the listbox is empty
return [] return []
...@@ -180,7 +187,7 @@ def getWorkflowActionDocumentList(self, **kw): ...@@ -180,7 +187,7 @@ def getWorkflowActionDocumentList(self, **kw):
if selection_uid_list: if selection_uid_list:
selection_params['uid'] = selection_uid_list selection_params['uid'] = selection_uid_list
workflow_id, action = listbox_selection['workflow_action'].split('/') workflow_id, action = listbox_selection['workflow_action'].split('/')[:2]
workflow = wtool.getWorkflowById(workflow_id) workflow = wtool.getWorkflowById(workflow_id)
for doc in selection_tool.callSelectionFor(selection_name, params=selection_params): for doc in selection_tool.callSelectionFor(selection_name, params=selection_params):
doc = doc.getObject() doc = doc.getObject()
......
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