[Erp5-report] r35378 ivan - in /erp5/trunk/bt5/erp5_ingestion: SkinTemplateItem/portal_skin...

[nobody at svn.erp5.org]

Author: ivan
Date: Mon May 17 13:25:27 2010
New Revision: 35378

URL: http://svn.erp5.org?rev=35378&view=rev
Log:
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).

Modified:
    erp5/trunk/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml
    erp5/trunk/bt5/erp5_ingestion/bt/revision

Modified: erp5/trunk/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml?rev=35378&r1=35377&r2=35378&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml [utf8] Mon May 17 13:25:27 2010
@@ -129,9 +129,9 @@
   # 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

Modified: erp5/trunk/bt5/erp5_ingestion/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ingestion/bt/revision?rev=35378&r1=35377&r2=35378&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ingestion/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_ingestion/bt/revision [utf8] Mon May 17 13:25:27 2010
@@ -1,1 +1,1 @@
-92
+93