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

[nobody at svn.erp5.org]

Author: ivan
Date: Fri Feb 26 12:34:51 2010
New Revision: 33147

URL: http://svn.erp5.org?rev=33147&view=rev
Log:
Do not use HTTP redirect but render view of ingested document as this may lead to conflict errors.

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=33147&r1=33146&r2=33147&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] Fri Feb 26 12:34:51 2010
@@ -134,9 +134,9 @@
   # 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 @@
                             <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>

Modified: erp5/trunk/bt5/erp5_ingestion/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ingestion/bt/revision?rev=33147&r1=33146&r2=33147&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ingestion/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_ingestion/bt/revision [utf8] Fri Feb 26 12:34:51 2010
@@ -1,1 +1,1 @@
-77
+82