From 43fb378902f82af50478f5c4039c557d50e67ac6 Mon Sep 17 00:00:00 2001 From: Ivan Tyagov <ivan@nexedi.com> Date: Fri, 29 Oct 2010 10:36:54 +0000 Subject: [PATCH] Since r39675 isWebMode and isEditableMode API changed so adjust actions accordingly. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@39678 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_types/Drawing/view.xml | 34 ++++--------------- .../portal_types/Drawing/web_view.xml | 23 +++++-------- .../portal_types/File/view_editor.xml | 22 ++++-------- .../portal_types/PDF/view.xml | 34 ++++--------------- .../portal_types/PDF/web_view.xml | 23 +++++-------- .../portal_types/Presentation/view.xml | 34 ++++--------------- .../portal_types/Presentation/web_view.xml | 23 +++++-------- .../portal_types/Spreadsheet/view.xml | 34 ++++--------------- .../portal_types/Spreadsheet/web_view.xml | 23 +++++-------- .../portal_types/Text/view.xml | 34 ++++--------------- .../portal_types/Text/web_view.xml | 23 +++++-------- bt5/erp5_dms/bt/revision | 2 +- .../portal_types/Person/web_view.xml | 19 +++-------- bt5/erp5_km/bt/revision | 2 +- .../portal_types/File/web_view.xml | 23 +++++-------- .../portal_types/Image/web_view.xml | 23 +++++-------- .../portal_types/Web%20Page/view.xml | 34 ++++--------------- .../portal_types/Web%20Page/view_editor.xml | 32 +++-------------- .../portal_types/Web%20Page/web_view.xml | 33 ++++++++++++------ .../portal_types/Web%20Site/view.xml | 34 ++++--------------- .../portal_types/Web%20Site/web_view.xml | 33 ++++++++++++------ bt5/erp5_web/bt/revision | 2 +- 22 files changed, 160 insertions(+), 384 deletions(-) diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/Drawing/view.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Drawing/view.xml index 195f938392..32175529a9 100644 --- a/bt5/erp5_dms/ActionTemplateItem/portal_types/Drawing/view.xml +++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/Drawing/view.xml @@ -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() or not object.hasBaseData())</string> </value> - </item> - </dictionary> - </pickle> - </record> </ZopeData> diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/Drawing/web_view.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Drawing/web_view.xml index 652681a41e..f3271c1c76 100644 --- a/bt5/erp5_dms/ActionTemplateItem/portal_types/Drawing/web_view.xml +++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/Drawing/web_view.xml @@ -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>2.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() and object.hasBaseData()</string> </value> + <value> <string>python:object is not None and object.isWebMode() and object.hasBaseData() and not object.isEditableMode()</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/File/view_editor.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/File/view_editor.xml index 1745ab7ee1..a3fbd19b08 100644 --- a/bt5/erp5_dms/ActionTemplateItem/portal_types/File/view_editor.xml +++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/File/view_editor.xml @@ -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,9 +32,8 @@ </item> <item> <key> <string>description</string> </key> - <value> - <none/> - </value> + <value> <string>python: object is not None and not object.isWebMode() and (object.getContentType() or \'\').startswith(\'text/\')\n +</string> </value> </item> <item> <key> <string>icon</string> </key> @@ -72,10 +68,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> @@ -88,16 +81,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 not object.isWebMode() and (object.getContentType() or \'\').startswith(\'text/\')</string> </value> + <value> <string>python: object is not None and (object.getContentType() or \'\').startswith(\'text/\')</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/PDF/view.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/PDF/view.xml index 0e90bdb11e..9d7ec0fef8 100644 --- a/bt5/erp5_dms/ActionTemplateItem/portal_types/PDF/view.xml +++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/PDF/view.xml @@ -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> diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/PDF/web_view.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/PDF/web_view.xml index ba49431ce8..87cfb5ad6a 100644 --- a/bt5/erp5_dms/ActionTemplateItem/portal_types/PDF/web_view.xml +++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/PDF/web_view.xml @@ -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>2.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> diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/Presentation/view.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Presentation/view.xml index 195f938392..32175529a9 100644 --- a/bt5/erp5_dms/ActionTemplateItem/portal_types/Presentation/view.xml +++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/Presentation/view.xml @@ -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() or not object.hasBaseData())</string> </value> - </item> - </dictionary> - </pickle> - </record> </ZopeData> diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/Presentation/web_view.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Presentation/web_view.xml index 652681a41e..f3271c1c76 100644 --- a/bt5/erp5_dms/ActionTemplateItem/portal_types/Presentation/web_view.xml +++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/Presentation/web_view.xml @@ -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>2.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() and object.hasBaseData()</string> </value> + <value> <string>python:object is not None and object.isWebMode() and object.hasBaseData() and not object.isEditableMode()</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/Spreadsheet/view.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Spreadsheet/view.xml index 195f938392..32175529a9 100644 --- a/bt5/erp5_dms/ActionTemplateItem/portal_types/Spreadsheet/view.xml +++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/Spreadsheet/view.xml @@ -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() or not object.hasBaseData())</string> </value> - </item> - </dictionary> - </pickle> - </record> </ZopeData> diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/Spreadsheet/web_view.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Spreadsheet/web_view.xml index 652681a41e..f3271c1c76 100644 --- a/bt5/erp5_dms/ActionTemplateItem/portal_types/Spreadsheet/web_view.xml +++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/Spreadsheet/web_view.xml @@ -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>2.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() and object.hasBaseData()</string> </value> + <value> <string>python:object is not None and object.isWebMode() and object.hasBaseData() and not object.isEditableMode()</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/Text/view.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Text/view.xml index 195f938392..32175529a9 100644 --- a/bt5/erp5_dms/ActionTemplateItem/portal_types/Text/view.xml +++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/Text/view.xml @@ -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() or not object.hasBaseData())</string> </value> - </item> - </dictionary> - </pickle> - </record> </ZopeData> diff --git a/bt5/erp5_dms/ActionTemplateItem/portal_types/Text/web_view.xml b/bt5/erp5_dms/ActionTemplateItem/portal_types/Text/web_view.xml index 652681a41e..b9ab188f4e 100644 --- a/bt5/erp5_dms/ActionTemplateItem/portal_types/Text/web_view.xml +++ b/bt5/erp5_dms/ActionTemplateItem/portal_types/Text/web_view.xml @@ -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>2.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() and object.hasBaseData()</string> </value> + <value> <string>python:object is not None and object.isWebMode() and object.hasBaseData() and not object.isEditableMode()</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_dms/bt/revision b/bt5/erp5_dms/bt/revision index 039b4cd3e5..130e16f6ba 100644 --- a/bt5/erp5_dms/bt/revision +++ b/bt5/erp5_dms/bt/revision @@ -1 +1 @@ -1198 \ No newline at end of file +1200 \ No newline at end of file diff --git a/bt5/erp5_km/ActionTemplateItem/portal_types/Person/web_view.xml b/bt5/erp5_km/ActionTemplateItem/portal_types/Person/web_view.xml index 8826d7e6c9..b4ccc9d3a2 100644 --- a/bt5/erp5_km/ActionTemplateItem/portal_types/Person/web_view.xml +++ b/bt5/erp5_km/ActionTemplateItem/portal_types/Person/web_view.xml @@ -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,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string></string> </value> + <value> <string>)</string> </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> @@ -86,16 +80,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 not object.isEditableMode() and object.isWebMode()</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_km/bt/revision b/bt5/erp5_km/bt/revision index 619686abc0..44c590d3f5 100644 --- a/bt5/erp5_km/bt/revision +++ b/bt5/erp5_km/bt/revision @@ -1 +1 @@ -1657 \ No newline at end of file +1658 \ No newline at end of file diff --git a/bt5/erp5_web/ActionTemplateItem/portal_types/File/web_view.xml b/bt5/erp5_web/ActionTemplateItem/portal_types/File/web_view.xml index 8841b77cfe..ccffaad826 100644 --- a/bt5/erp5_web/ActionTemplateItem/portal_types/File/web_view.xml +++ b/bt5/erp5_web/ActionTemplateItem/portal_types/File/web_view.xml @@ -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> diff --git a/bt5/erp5_web/ActionTemplateItem/portal_types/Image/web_view.xml b/bt5/erp5_web/ActionTemplateItem/portal_types/Image/web_view.xml index 1b96b64b8f..4dd1dcfa8d 100644 --- a/bt5/erp5_web/ActionTemplateItem/portal_types/Image/web_view.xml +++ b/bt5/erp5_web/ActionTemplateItem/portal_types/Image/web_view.xml @@ -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> diff --git a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/view.xml b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/view.xml index 5e3cf5ee0e..04e522f26e 100644 --- a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/view.xml +++ b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/view.xml @@ -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> diff --git a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/view_editor.xml b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/view_editor.xml index e3470cc53c..8db0971506 100644 --- a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/view_editor.xml +++ b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/view_editor.xml @@ -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> diff --git a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/web_view.xml b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/web_view.xml index b8de09c61a..dbeb451c59 100644 --- a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/web_view.xml +++ b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/web_view.xml @@ -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> diff --git a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/view.xml b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/view.xml index bdf6056055..cf762beb43 100644 --- a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/view.xml +++ b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/view.xml @@ -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> diff --git a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/web_view.xml b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/web_view.xml index 3767bf9387..764c812bb9 100644 --- a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/web_view.xml +++ b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/web_view.xml @@ -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> diff --git a/bt5/erp5_web/bt/revision b/bt5/erp5_web/bt/revision index 8ced8f781c..1345866d11 100644 --- a/bt5/erp5_web/bt/revision +++ b/bt5/erp5_web/bt/revision @@ -1 +1 @@ -989 \ No newline at end of file +994 \ No newline at end of file -- 2.30.9