diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callViewDialogMethod.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callViewDialogMethod.xml index 96ee5654842a9aee236e00a2c9f3d4fdb66cda44..4d12649fe13246787508bef081de00eeb17a9cf9 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callViewDialogMethod.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callViewDialogMethod.xml @@ -84,16 +84,12 @@ if dialog_method == \'Base_edit\':\n )\n #Exceptions for Workflow\n if dialog_method == \'Workflow_statusModify\':\n - return context.Workflow_statusModify( form_id=form_id\n + value = context.Workflow_statusModify( form_id=form_id\n , dialog_id=dialog_id\n )\n -#Exceptions for Mass Workflow Modifications\n -if dialog_method == \'Folder_modifyWorkflowStatus\':\n - return context.Folder_modifyWorkflowStatus( form_id = form_id\n - , dialog_id = dialog_id\n - , selection_name = selection_name\n - )\n -#Exceptions for UI configurations\n + if not(getattr(request, \'ignore_layout\', 0)) and context.getApplicableLayout() :\n + value = request.RESPONSE.redirect(context.WebSite_getDocumentPhysicalPath())\n + return value\n if dialog_method == \'Base_configureUI\':\n return context.Base_configureUI( form_id=form_id\n , selection_name=selection_name\n diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml index ab88b8bf1081ea65167c9ff142209bc75385adb6..f059a5cecec3999d61713443ba5940f28fb532f9 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml @@ -268,7 +268,7 @@ except FormValidationError, validation_errors:\n else:\n message = N_("Data+Updated.")\n if not(ignore_layout) and context.getApplicableLayout() :\n - redirect_url = \'%s?editable_mode=1\' % context.WebSite_getDocumentUrl()\n + redirect_url = \'%s?editable_mode=1\' % context.REQUEST.URL1\n elif not selection_index:\n redirect_url = \'%s/%s?portal_status_message=%s\' % ( context.absolute_url()\n , form_id\n