[Erp5-report] r40277 ivan - in /erp5/trunk/bt5/erp5_web: ActionTemplateItem/portal_types/We...

[nobody at svn.erp5.org]

Author: ivan
Date: Mon Nov 15 16:01:54 2010
New Revision: 40277

URL: http://svn.erp5.org?rev=40277&view=rev
Log:
Allow web_view on Web Section override default  "view".

Modified:
    erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Section/view.xml
    erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Section/web_view.xml
    erp5/trunk/bt5/erp5_web/bt/revision

Modified: erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Section/view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%2520Section/view.xml?rev=40277&r1=40276&r2=40277&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Section/view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Section/view.xml [utf8] Mon Nov 15 16:01:54 2010
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -29,13 +26,13 @@
         </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>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>icon</string> </key>
@@ -70,10 +67,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -84,20 +78,4 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>python: object is not None and not object.isWebMode()</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>

Modified: erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Section/web_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%2520Section/web_view.xml?rev=40277&r1=40276&r2=40277&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Section/web_view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Section/web_view.xml [utf8] Mon Nov 15 16:01:54 2010
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -35,7 +32,9 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>icon</string> </key>
@@ -55,7 +54,7 @@
         </item>
         <item>
             <key> <string>priority</string> </key>
-            <value> <float>3.0</float> </value>
+            <value> <float>0.1</float> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
@@ -70,10 +69,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -86,16 +82,13 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <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/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/revision?rev=40277&r1=40276&r2=40277&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/bt/revision [utf8] Mon Nov 15 16:01:54 2010
@@ -1 +1 @@
-998
\ No newline at end of file
+999
\ No newline at end of file