From 927e5d4e9bf0a12c0e69cbb9d22bd8cdf3c7dcb0 Mon Sep 17 00:00:00 2001 From: Ivan Tyagov <ivan@nexedi.com> Date: Mon, 17 May 2010 11:25:27 +0000 Subject: [PATCH] Use redirect rather than render default document (in previous implementation of Base_contribute doing a direct view in the same request caused ConflicErrors in error logs). git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35378 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_skins/erp5_ingestion/Base_contribute.xml | 6 +++--- bt5/erp5_ingestion/bt/revision | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml b/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml index 802adb1be3..5f94077e4e 100644 --- a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml +++ b/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml @@ -129,9 +129,9 @@ if redirect_to_document or redirect_url is not None:\n # by ERP5 form\n if redirect_to_document and document is not None:\n # explicitly required to view ingested document\n - context.REQUEST.set(\'portal_status_message\', message)\n - context.REQUEST.set(\'editable_mode\', editable_mode)\n - return document.view()\n + return document.Base_redirect(\'view\', \n + keep_items={\'portal_status_message\': message,\n + \'editable_mode\': editable_mode})\n elif redirect_url is not None:\n # redirect URL has been supplied by caller\n from ZTUtils import make_query\n diff --git a/bt5/erp5_ingestion/bt/revision b/bt5/erp5_ingestion/bt/revision index 69226f7293..27a37eb577 100644 --- a/bt5/erp5_ingestion/bt/revision +++ b/bt5/erp5_ingestion/bt/revision @@ -1 +1 @@ -92 \ No newline at end of file +93 \ No newline at end of file -- 2.30.9