[Erp5-report] r27803 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Jun 26 20:44:07 CEST 2009
Author: kazuhiko
Date: Fri Jun 26 20:44:07 2009
New Revision: 27803
URL: http://svn.erp5.org?rev=27803&view=rev
Log:
* improve the condition of 'Save & View' in Base_edit.
* modify Predicate_edit to support 'Save & View'.
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/Predicate_edit.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=27803&r1=27802&r2=27803&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] Fri Jun 26 20:44:07 2009
@@ -261,11 +261,10 @@
#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
+# for web mode, we should use \'view\' instead of passed form_id\n
+# after \'Save & View\'.\n
if context.REQUEST.get(\'is_web_mode\', False) and \\\n
- form_id in (\'WebSite_view\', \'WebSection_view\', \'WebPage_view\',\n
- \'WebPage_viewEditor\'):\n
+ not editable_mode:\n
form_id = \'view\'\n
\n
if not selection_index:\n
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_edit.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_edit.xml?rev=27803&r1=27802&r2=27803&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_edit.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_edit.xml [utf8] Fri Jun 26 20:44:07 2009
@@ -53,7 +53,9 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string># Updates attributes of an Zope document\n
+ <value> <string encoding="cdata"><![CDATA[
+
+# Updates attributes of an Zope document\n
# which is in a class inheriting from ERP5 Base\n
#\n
# TODO\n
@@ -103,6 +105,12 @@
request.set(\'field_errors\', field_errors)\n
return form(request)\n
else:\n
+ # for web mode, we should use \'view\' instead of passed form_id\n
+ # after \'Save & View\'.\n
+ if context.REQUEST.get(\'is_web_mode\', False) and \\\n
+ not editable_mode:\n
+ form_id = \'view\'\n
+\n
if not selection_index:\n
redirect_url = \'%s/%s?%s\' % (\n
context.absolute_url(),\n
@@ -125,7 +133,9 @@
)\n
\n
request[ \'RESPONSE\' ].redirect( redirect_url )\n
-</string> </value>
+
+
+]]></string> </value>
</item>
<item>
<key> <string>_code</string> </key>
@@ -193,6 +203,7 @@
<string>_apply_</string>
<string>validation_errors</string>
<string>field_errors</string>
+ <string>False</string>
<string>redirect_url</string>
</tuple>
</value>
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=27803&r1=27802&r2=27803&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Fri Jun 26 20:44:07 2009
@@ -1,1 +1,1 @@
-1240
+1241
More information about the Erp5-report
mailing list