[Erp5-report] r44419 ivan - in /erp5/trunk/bt5/erp5_web: ActionTemplateItem/portal_types/We...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Mar 18 09:13:51 CET 2011
Author: ivan
Date: Fri Mar 18 09:13:51 2011
New Revision: 44419
URL: http://svn.erp5.org?rev=44419&view=rev
Log:
Fix Web Site actions for web_view.
Delegate "web_view" implementation to default Web Site rendering (not an ERP5 form).
Removed:
erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewAsWeb/
Modified:
erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/web_view.xml
erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewAsWeb.xml
erp5/trunk/bt5/erp5_web/bt/revision
Modified: erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/web_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%2520Site/web_view.xml?rev=44419&r1=44418&r2=44419&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/web_view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/web_view.xml [utf8] Fri Mar 18 09:13:51 2011
@@ -88,7 +88,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>python: object is not None and object.isWebMode()</string> </value>
+ <value> <string>python: object is not None and object.isWebMode() and not object.isEditableMode()</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewAsWeb.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewAsWeb.xml?rev=44419&r1=44418&r2=44419&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewAsWeb.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_viewAsWeb.xml [utf8] Fri Mar 18 09:13:51 2011
@@ -2,11 +2,15 @@
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
- <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
<key> <string>_bind_names</string> </key>
<value>
<object>
@@ -19,7 +23,24 @@
<item>
<key> <string>_asgns</string> </key>
<value>
- <dictionary/>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
</value>
</item>
</dictionary>
@@ -28,92 +49,21 @@
</value>
</item>
<item>
- <key> <string>_objects</string> </key>
- <value>
- <tuple/>
- </value>
+ <key> <string>_body</string> </key>
+ <value> <string>"""\n
+ Return default rendering of Web Site for KM.\n
+"""\n
+return context()\n
+</string> </value>
</item>
<item>
- <key> <string>action</string> </key>
- <value> <string>Base_edit</string> </value>
- </item>
- <item>
- <key> <string>encoding</string> </key>
- <value> <string>UTF-8</string> </value>
- </item>
- <item>
- <key> <string>enctype</string> </key>
+ <key> <string>_params</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>group_list</string> </key>
- <value>
- <list>
- <string>webcontent header bottom</string>
- <string>webcontent bottom</string>
- </list>
- </value>
- </item>
- <item>
- <key> <string>groups</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>webcontent bottom</string> </key>
- <value>
- <list>
- <string>my_description</string>
- <string>listbox</string>
- </list>
- </value>
- </item>
- <item>
- <key> <string>webcontent header bottom</string> </key>
- <value>
- <list>
- <string>my_title</string>
- </list>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
<key> <string>id</string> </key>
<value> <string>WebSite_viewAsWeb</string> </value>
</item>
- <item>
- <key> <string>method</string> </key>
- <value> <string>POST</string> </value>
- </item>
- <item>
- <key> <string>name</string> </key>
- <value> <string>WebSite_viewAsWeb</string> </value>
- </item>
- <item>
- <key> <string>pt</string> </key>
- <value> <string>form_view</string> </value>
- </item>
- <item>
- <key> <string>row_length</string> </key>
- <value> <int>4</int> </value>
- </item>
- <item>
- <key> <string>stored_encoding</string> </key>
- <value> <string>UTF-8</string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Web Site</string> </value>
- </item>
- <item>
- <key> <string>unicode_mode</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>update_action</string> </key>
- <value> <string></string> </value>
- </item>
</dictionary>
</pickle>
</record>
Modified: erp5/trunk/bt5/erp5_web/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/revision?rev=44419&r1=44418&r2=44419&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/bt/revision [utf8] Fri Mar 18 09:13:51 2011
@@ -1 +1 @@
-1035
\ No newline at end of file
+1036
\ No newline at end of file
More information about the Erp5-report
mailing list