From 1630b968daea5ae06e7225a191b28c7b9ea7bbb8 Mon Sep 17 00:00:00 2001
From: Ivan Tyagov <ivan@nexedi.com>
Date: Fri, 26 Feb 2010 11:34:51 +0000
Subject: [PATCH] Do not use HTTP redirect but render view of ingested document
 as this may lead to conflict errors.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@33147 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../portal_skins/erp5_ingestion/Base_contribute.xml       | 8 ++++----
 bt5/erp5_ingestion/bt/revision                            | 2 +-
 2 files changed, 5 insertions(+), 5 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 0392aadc66..c7fafe47dc 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
@@ -134,9 +134,9 @@ if redirect_to_document or redirect_url is not None:\n
   # by ERP5 form\n
   message = context.Base_translateString(message)\n
   if redirect_to_document and document is not None:\n
-    # explicitly requried to redirect to ingested document\n
-    return document.Base_redirect(\'view\', \n
-                                  keep_items=dict(portal_status_message=message))\n
+    # explicitly required to view ingested document\n
+    context.REQUEST.set(\'portal_status_message\', message)\n
+    return document.view()\n
   elif redirect_url is not None:\n
     # redirect URL has been supplied by caller\n
     from ZTUtils import make_query\n
@@ -219,9 +219,9 @@ return document\n
                             <string>$append0</string>
                             <string>x</string>
                             <string>document_portal_type</string>
-                            <string>dict</string>
                             <string>ZTUtils</string>
                             <string>make_query</string>
+                            <string>dict</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_ingestion/bt/revision b/bt5/erp5_ingestion/bt/revision
index 780fea92d2..9d1ce53f8c 100644
--- a/bt5/erp5_ingestion/bt/revision
+++ b/bt5/erp5_ingestion/bt/revision
@@ -1 +1 @@
-77
\ No newline at end of file
+82
\ No newline at end of file
-- 
2.30.9