[Erp5-report] r27666 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Jun 18 22:21:04 2009
New Revision: 27666

URL: http://svn.erp5.org?rev=27666&view=rev
Log:
* back to 'view' instead of 'WebSite_view', 'WebSection_view' or 'WebPage_view' in 'Save & View' action.
* fix getting ignore_layout parameter in Base_editRelation for web mode.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_editRelation.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml?rev=27666&r1=27665&r2=27666&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml [utf8] Thu Jun 18 22:21:04 2009
@@ -260,6 +260,12 @@
 spp.insert(0,s_url)\n
 #calculate direct the url instead of using absolute_url\n
 new_url = \'/\'.join(spp)\n
+\n
+# for web mode, we should use \'view\' instead of \'WebSite_view\',\n
+# \'WebSection_view\' or \'WebPage_view\'.\n
+if context.REQUEST.get(\'is_web_mode\', False) and \\\n
+    form_id in (\'WebSite_view\', \'WebSection_view\', \'WebPage_view\'):\n
+  form_id = \'view\'\n
 \n
 if not selection_index:\n
   redirect_url = \'%s/%s?ignore_layout:int=%s&editable_mode:int=%s&portal_status_message=%s\' % (\n
@@ -374,6 +380,7 @@
                             <string>list</string>
                             <string>s_url</string>
                             <string>new_url</string>
+                            <string>False</string>
                             <string>result</string>
                           </tuple>
                         </value>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_editRelation.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_editRelation.xml?rev=27666&r1=27665&r2=27666&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_editRelation.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_editRelation.xml [utf8] Thu Jun 18 22:21:04 2009
@@ -92,7 +92,7 @@
 request.form.update(old_request)\n
 edit_method = getattr(context, request_form.get(\'form_action\', \'Base_edit\'))\n
 return edit_method(form_id,\n
-                   ignore_layout=old_request.get(\'ignore_layout\', True),\n
+                   ignore_layout=request.get(\'ignore_layout\', True),\n
                    selection_index=old_request.get(\'selection_index\', 0),\n
                    selection_name=old_request.get(\'selection_name\', \'\'))\n
 

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=27666&r1=27665&r2=27666&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Thu Jun 18 22:21:04 2009
@@ -1,1 +1,1 @@
-1237
+1238