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

nobody at svn.erp5.org nobody at svn.erp5.org
Fri Oct 29 12:30:02 CEST 2010


Author: ivan
Date: Fri Oct 29 12:29:52 2010
New Revision: 39676

URL: http://svn.erp5.org?rev=39676&view=rev
Log:
Since r39675 isWebMode and isEditableMode API changed so adjust actions accordingly.

Modified:
    erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/File/web_view.xml
    erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Image/web_view.xml
    erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/view.xml
    erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/view_editor.xml
    erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/web_view.xml
    erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/view.xml
    erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/web_view.xml
    erp5/trunk/bt5/erp5_web/bt/revision

Modified: erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/File/web_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/File/web_view.xml?rev=39676&r1=39675&r2=39676&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/File/web_view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/File/web_view.xml [utf8] Fri Oct 29 12:29:52 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>0.5</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() and object.hasData()</string> </value>
+            <value> <string>python:object is not None and object.isWebMode() and object.hasData() and not object.isEditableMode()</string> </value>
         </item>
       </dictionary>
     </pickle>

Modified: erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Image/web_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Image/web_view.xml?rev=39676&r1=39675&r2=39676&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Image/web_view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Image/web_view.xml [utf8] Fri Oct 29 12:29:52 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>0.5</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() and object.hasData()</string> </value>
+            <value> <string>python:object is not None and object.isWebMode() and object.hasData() and not object.isEditableMode()</string> </value>
         </item>
       </dictionary>
     </pickle>

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=39676&r1=39675&r2=39676&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/view.xml [utf8] Fri Oct 29 12:29:52 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%20Page/view_editor.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%2520Page/view_editor.xml?rev=39676&r1=39675&r2=39676&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/view_editor.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/view_editor.xml [utf8] Fri Oct 29 12:29:52 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,11 @@
         </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> <string>python: object is not None and not object.isWebMode()</string> </value>
         </item>
         <item>
             <key> <string>icon</string> </key>
@@ -70,10 +65,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 +76,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%20Page/web_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%2520Page/web_view.xml?rev=39676&r1=39675&r2=39676&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/web_view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/web_view.xml [utf8] Fri Oct 29 12:29:52 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,11 +26,15 @@
         </item>
         <item>
             <key> <string>condition</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>icon</string> </key>
@@ -53,7 +54,7 @@
         </item>
         <item>
             <key> <string>priority</string> </key>
-            <value> <float>2.0</float> </value>
+            <value> <float>0.2</float> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
@@ -68,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>
@@ -82,4 +80,17 @@
       </dictionary>
     </pickle>
   </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <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()  and not object.isEditableMode()</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>

Modified: erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%2520Site/view.xml?rev=39676&r1=39675&r2=39676&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/view.xml [utf8] Fri Oct 29 12:29:52 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%20Site/web_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/ActionTemplateItem/portal_types/Web%2520Site/web_view.xml?rev=39676&r1=39675&r2=39676&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 Oct 29 12:29:52 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,11 +26,15 @@
         </item>
         <item>
             <key> <string>condition</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>icon</string> </key>
@@ -53,7 +54,7 @@
         </item>
         <item>
             <key> <string>priority</string> </key>
-            <value> <float>2.0</float> </value>
+            <value> <float>0.2</float> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
@@ -68,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>
@@ -82,4 +80,17 @@
       </dictionary>
     </pickle>
   </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <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>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>

Modified: erp5/trunk/bt5/erp5_web/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/revision?rev=39676&r1=39675&r2=39676&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/bt/revision [utf8] Fri Oct 29 12:29:52 2010
@@ -1 +1 @@
-989
\ No newline at end of file
+994
\ No newline at end of file




More information about the Erp5-report mailing list