Improve error handling on Workflow_statusModify. If divergence is solved by...

Improve error handling on Workflow_statusModify. If divergence is solved by other user, then show a nice message.

product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Workflow_statusModify.xml

@@ -74,8 +74,13 @@ try:\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 form(request)\n
+  # Only for solve divergence dialog.\n
+  if dialog_id == \'Delivery_viewSolveDivergenceDialog\' and set([error.error_key for error in field_errors.values()])==set([\'unknown_selection\']):\n
+    message = translateString("Workflow state may have been updated by other user. Please try again.")\n
+    return context.Base_redirect(form_id, keep_items={\'portal_status_message\': message}, **kw)\n
+  else:\n
+    request.set(\'field_errors\', field_errors)\n
+    return 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

product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log

+2012-10-16 yusei
+* Improve error handling on Workflow_statusModify. If divergence is solved by other user, then show a nice message.
+
 2012-10-16 yusei
 * Improve error handling on Workflow_statusModify. If requested transition is not available, then show a nice message.
 

product/ERP5/bootstrap/erp5_xhtml_style/bt/revision

-1101
\ No newline at end of file
+1102
\ No newline at end of file