[Erp5-report] r32544 mame - in /erp5/trunk/bt5/erp5_web: SkinTemplateItem/portal_skins/erp5...

[nobody at svn.erp5.org]

Author: mame
Date: Mon Feb 15 13:47:16 2010
New Revision: 32544

URL: http://svn.erp5.org?rev=32544&view=rev
Log:
Modified so that title is properly translated when script is used

Modified:
    erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_createNewWebPage.xml
    erp5/trunk/bt5/erp5_web/bt/revision

Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_createNewWebPage.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_createNewWebPage.xml?rev=32544&r1=32543&r2=32544&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_createNewWebPage.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_createNewWebPage.xml [utf8] Mon Feb 15 13:47:16 2010
@@ -53,9 +53,9 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
-
-request = context.REQUEST\n
+            <value> <string>request = context.REQUEST\n
+request_form = context.REQUEST.form\n
+from ZTUtils import make_query\n
 portal = context.getPortalObject()\n
 title = context.getTitle(\'Unknown\')\n
 translateString = context.Base_translateString\n
@@ -74,17 +74,21 @@
 category_list = context.getMembershipCriterionCategoryList()\n
 web_page.setCategoryList(web_page.getCategoryList() + category_list)\n
 \n
+\n
 # Return the new page in the section context\n
-editable_mode = 1\n
-message = translateString("New Web Page of section %s." %(context.getTitle()))\n
-redirect_url = \'%s/%s/view?portal_status_message=%s&editable_mode:int=%s\' % (\n
-            context.absolute_url(), web_page.getRelativeUrl(),message,editable_mode)\n
+keep_items = dict(editable_mode=1,\n
+              portal_status_message=translateString("New Web Page of section ${web_section}.",\n
+              mapping = dict(web_section=title)))\n
+\n
+request_form.update(keep_items)\n
+message = make_query(dict([(k, v) for k, v in request_form.items() if k and v is not None]))\n
+\n
+redirect_url = \'%s/%s/view?%s\' % (\n
+            context.absolute_url(), web_page.getRelativeUrl(),message)\n
 \n
 # return to the new page in the section context\n
 return context.REQUEST.RESPONSE.redirect(redirect_url)\n
-
-
-]]></string> </value>
+</string> </value>
         </item>
         <item>
             <key> <string>_code</string> </key>
@@ -123,6 +127,9 @@
                             <string>_getattr_</string>
                             <string>context</string>
                             <string>request</string>
+                            <string>request_form</string>
+                            <string>ZTUtils</string>
+                            <string>make_query</string>
                             <string>portal</string>
                             <string>title</string>
                             <string>translateString</string>
@@ -130,7 +137,14 @@
                             <string>language</string>
                             <string>web_page</string>
                             <string>category_list</string>
-                            <string>editable_mode</string>
+                            <string>dict</string>
+                            <string>keep_items</string>
+                            <string>append</string>
+                            <string>$append0</string>
+                            <string>_getiter_</string>
+                            <string>k</string>
+                            <string>v</string>
+                            <string>None</string>
                             <string>message</string>
                             <string>redirect_url</string>
                           </tuple>

Modified: erp5/trunk/bt5/erp5_web/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/revision?rev=32544&r1=32543&r2=32544&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/bt/revision [utf8] Mon Feb 15 13:47:16 2010
@@ -1,1 +1,1 @@
-906
+907