diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Workflow_statusModify.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Workflow_statusModify.xml index 10574031769ee13b3984e787034852be41f1f963..313012b5ef421db607d864528eceae75762cbd5d 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Workflow_statusModify.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Workflow_statusModify.xml @@ -119,18 +119,20 @@ except ValidationFailed, error_message:\n message = str(message)\n else:\n message = str(error_message)\n - return context.ERP5Site_redirect(\n - \'%s/%s\' % (context.absolute_url(), form_id),\n + return context.Base_redirect(form_id,\n keep_items={\'portal_status_message\': message}, **kw)\n \n portal_status_message = request.get(\'portal_status_message\', translateString(\'Status changed.\'))\n \n # Allow to redirect to another document\n -redirect_document_path = request.get(\'redirect_document_path\', context.getRelativeUrl())\n -redirect_document = context.restrictedTraverse(redirect_document_path)\n +redirect_document_path = request.get(\'redirect_document_path\', None)\n +if redirect_document_path:\n + redirect_document = portal.restrictedTraverse(redirect_document_path)\n + form_id = \'view\'\n +else:\n + redirect_document = context\n \n -return context.ERP5Site_redirect(\n - \'%s/%s\' % (redirect_document.absolute_url(), form_id),\n +return redirect_document.Base_redirect(form_id,\n keep_items={\'portal_status_message\': portal_status_message})\n </string> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision index 1b54fc946f391c91de691a712c97c423c84fc022..2cda7945ff0a2e91f9c61f6c22529ba262a076e5 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision @@ -1 +1 @@ -851 \ No newline at end of file +852 \ No newline at end of file