From b0acfac91bf35e92b2a5e9c788635e83184a506c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20Algrain?= <fxalgrain@tiolive.com> Date: Tue, 23 Nov 2010 18:41:38 +0000 Subject: [PATCH] Implement "Force Anonymous Gadget" provided by knowledge pad API. Reorder items in toolbar display field git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40560 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../my_layout_display_toolbar_widget.xml | 8 ++++---- .../right_gadget.xml | 17 ++++------------- .../widget_management.xml | 17 ++++++++++++++++- .../erp5_km_minimal_layout/right_gadget.xml | 12 +++--------- bt5/erp5_km/bt/revision | 2 +- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewKMMinimalThemeConfiguration/my_layout_display_toolbar_widget.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewKMMinimalThemeConfiguration/my_layout_display_toolbar_widget.xml index e2abbcdbe7..66c1040048 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewKMMinimalThemeConfiguration/my_layout_display_toolbar_widget.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewKMMinimalThemeConfiguration/my_layout_display_toolbar_widget.xml @@ -95,6 +95,10 @@ <key> <string>items</string> </key> <value> <list> + <tuple> + <string>Display</string> + <string>display</string> + </tuple> <tuple> <string>Webmaster</string> <string>webmaster</string> @@ -103,10 +107,6 @@ <string>Context</string> <string>context</string> </tuple> - <tuple> - <string>Display</string> - <string>display</string> - </tuple> <tuple> <string>Hide</string> <string>hide</string> diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/right_gadget.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/right_gadget.xml index fdd344b383..a9ada347f7 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/right_gadget.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/right_gadget.xml @@ -2,10 +2,7 @@ <ZopeData> <record id="1" aka="AAAAAAAAAAE="> <pickle> - <tuple> - <global name="EditorField" module="Products.ERP5Form.EditorField"/> - <tuple/> - </tuple> + <global name="EditorField" module="Products.ERP5Form.EditorField"/> </pickle> <pickle> <dictionary> @@ -298,26 +295,20 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <global name="TALESMethod" module="Products.Formulator.TALESField"/> - <tuple/> - </tuple> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> </pickle> <pickle> <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python: here.WebSection_viewColumnOne(default_pad_group=\'default_content_pad\')</string> </value> + <value> <string>python: here.WebSection_viewColumnOne(default_pad_group=\'default_content_pad\', use_anonymous_knowledge_pad=context.getLayoutProperty(\'layout_force_anonymous_gadget\',False))</string> </value> </item> </dictionary> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <global name="TALESMethod" module="Products.Formulator.TALESField"/> - <tuple/> - </tuple> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> </pickle> <pickle> <dictionary> diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/widget_management.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/widget_management.xml index 3a48bf19c7..4fb6aac2d7 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/widget_management.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/widget_management.xml @@ -148,7 +148,9 @@ </item> <item> <key> <string>enabled</string> </key> - <value> <string></string> </value> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> </item> <item> <key> <string>external_validator</string> </key> @@ -304,4 +306,17 @@ </dictionary> </pickle> </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python: not here.getLayoutProperty(\'layout_force_anonymous_gadget\')</string> </value> + </item> + </dictionary> + </pickle> + </record> </ZopeData> diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_layout/right_gadget.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_layout/right_gadget.xml index fa05c6f7f6..04af1e84d5 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_layout/right_gadget.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_layout/right_gadget.xml @@ -2,10 +2,7 @@ <ZopeData> <record id="1" aka="AAAAAAAAAAE="> <pickle> - <tuple> - <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> - <tuple/> - </tuple> + <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> </pickle> <pickle> <dictionary> @@ -104,16 +101,13 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <global name="TALESMethod" module="Products.Formulator.TALESField"/> - <tuple/> - </tuple> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> </pickle> <pickle> <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python: here.WebSection_viewColumnOne(default_pad_group=\'default_section_pad\')</string> </value> + <value> <string>python: here.WebSection_viewColumnOne(default_pad_group=\'default_section_pad\', use_anonymous_knowledge_pad=context.getLayoutProperty(\'layout_force_anonymous_gadget\',False))</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_km/bt/revision b/bt5/erp5_km/bt/revision index 203719af2f..64ef4cbab9 100644 --- a/bt5/erp5_km/bt/revision +++ b/bt5/erp5_km/bt/revision @@ -1 +1 @@ -1689 \ No newline at end of file +1690 \ No newline at end of file -- 2.30.9