[Erp5-report] r9600 - in /erp5/trunk/bt5/erp5_web: ActionTemplateItem/portal_types/Web%20Pa...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Aug 31 17:47:34 CEST 2006
Author: kevin
Date: Thu Aug 31 17:47:31 2006
New Revision: 9600
URL: http://svn.erp5.org?rev=9600&view=rev
Log:
Replace dummy guards on alternate Web Page view with correct behaviour.
Modified:
erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/view.xml
erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/web_view.xml
erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebPage_viewAsWeb.xml
erp5/trunk/bt5/erp5_web/bt/change_log
erp5/trunk/bt5/erp5_web/bt/revision
erp5/trunk/bt5/erp5_web/bt/version
Modified: erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%2520Page/view.xml?rev=9600&r1=9599&r2=9600&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/view.xml (original)
+++ erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/view.xml Thu Aug 31 17:47:31 2006
@@ -30,9 +30,7 @@
</item>
<item>
<key> <string>condition</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
@@ -56,7 +54,7 @@
</item>
<item>
<key> <string>priority</string> </key>
- <value> <float>1.0</float> </value>
+ <value> <float>1.5</float> </value>
</item>
<item>
<key> <string>title</string> </key>
@@ -88,23 +86,4 @@
</dictionary>
</pickle>
</record>
- <record id="3" aka="AAAAAAAAAAM=">
- <pickle>
- <tuple>
- <tuple>
- <string>Products.CMFCore.Expression</string>
- <string>Expression</string>
- </tuple>
- <none/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>text</string> </key>
- <value> <string>python: False</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
Modified: erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/web_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%2520Page/web_view.xml?rev=9600&r1=9599&r2=9600&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/web_view.xml (original)
+++ erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/web_view.xml Thu Aug 31 17:47:31 2006
@@ -56,7 +56,7 @@
</item>
<item>
<key> <string>priority</string> </key>
- <value> <float>1.5</float> </value>
+ <value> <float>1.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
@@ -102,7 +102,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>python: True</string> </value>
+ <value> <string>python: hasattr(request, \'web_site_value\') and not (getattr(request, \'ignore_layout\', False) or getattr(request, \'editable_mode\', False))</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebPage_viewAsWeb.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebPage_viewAsWeb.xml?rev=9600&r1=9599&r2=9600&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebPage_viewAsWeb.xml (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebPage_viewAsWeb.xml Thu Aug 31 17:47:31 2006
@@ -104,7 +104,7 @@
</item>
<item>
<key> <string>name</string> </key>
- <value> <string>WebPage_view</string> </value>
+ <value> <string>WebPage_viewAsWeb</string> </value>
</item>
<item>
<key> <string>pt</string> </key>
Modified: erp5/trunk/bt5/erp5_web/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/change_log?rev=9600&r1=9599&r2=9600&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_web/bt/change_log Thu Aug 31 17:47:31 2006
@@ -4,7 +4,7 @@
* Set the default Webmaster User ID at Web Site creation.
* Webmaster and ID are now required.
Rename "Webmaster" to "Webmaster User ID" to avoid confusion.
-* Add alternate Web Page view with dummy guards.
+* Add alternate Web Page view for web mode.
2006-08-31 Stefan
* WebSection_getDocumentValueList now returns the newest version for each
Modified: erp5/trunk/bt5/erp5_web/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/revision?rev=9600&r1=9599&r2=9600&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/revision (original)
+++ erp5/trunk/bt5/erp5_web/bt/revision Thu Aug 31 17:47:31 2006
@@ -1,1 +1,1 @@
-301
+304
Modified: erp5/trunk/bt5/erp5_web/bt/version
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/version?rev=9600&r1=9599&r2=9600&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/version (original)
+++ erp5/trunk/bt5/erp5_web/bt/version Thu Aug 31 17:47:31 2006
@@ -1,1 +1,1 @@
-0.3.18
+0.3.19
More information about the Erp5-report
mailing list