[Erp5-report] r24824 - in /erp5/trunk/bt5/erp5_base: SkinTemplateItem/portal_skins/erp5_bas...

[nobody at svn.erp5.org]

Author: romain
Date: Mon Dec  8 11:03:09 2008
New Revision: 24824

URL: http://svn.erp5.org?rev=24824&view=rev
Log:
Do not redirect when using portal_contributions, in order to prevent conflict with automatic metadata detection

Modified:
    erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_createNewFile.xml
    erp5/trunk/bt5/erp5_base/bt/revision

Modified: erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_createNewFile.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_createNewFile.xml?rev=24824&r1=24823&r2=24824&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_createNewFile.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_createNewFile.xml [utf8] Mon Dec  8 11:03:09 2008
@@ -72,16 +72,20 @@
   }\n
 \n
   container = getToolByName(context.getPortalObject(), \'portal_contributions\', None)\n
+  # Do not redirect when using portal_contributions, in order to prevent\n
+  # conflict with automatic metadata detection\n
+  redirect = 0\n
 \n
   is_authorized = 1\n
   if container is None:\n
     container = context\n
     document_new_content_kw[\'portal_type\'] = portal_type\n
+    redirect = 1\n
     if portal_type not in [\'%s\' % x.id for x in container.allowedContentTypes()]:\n
       is_authorized = 0\n
 \n
   if not context.Base_checkPermission(container.getRelativeUrl(),\n
-                                  \'Add portal content\'):\n
+                                      \'Add portal content\'):\n
     is_authorized = 0\n
 \n
   if not is_authorized:\n
@@ -95,8 +99,12 @@
 \n
   message = translateString(\'${portal_type} created successfully.\',\n
                mapping={\'portal_type\': document.getTranslatedPortalType()})\n
-  return document.Base_redirect(\'view\', \n
-                                keep_items=dict(portal_status_message=message))\n
+  if redirect:\n
+    return document.Base_redirect(\'view\', \n
+                                  keep_items=dict(portal_status_message=message))\n
+  else:\n
+    return context.Base_redirect(\'view\', \n
+                                 keep_items=dict(portal_status_message=message))\n
 </string> </value>
         </item>
         <item>
@@ -152,6 +160,7 @@
                             <string>document_new_content_kw</string>
                             <string>document_edit_kw</string>
                             <string>container</string>
+                            <string>redirect</string>
                             <string>is_authorized</string>
                             <string>_write_</string>
                             <string>append</string>

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=24824&r1=24823&r2=24824&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Mon Dec  8 11:03:09 2008
@@ -1,1 +1,1 @@
-487
+488