From 6f85d5acee9d0d2188cafdb910fe0b00496906e2 Mon Sep 17 00:00:00 2001 From: Gabriel Monnerat <gabriel@tiolive.com> Date: Wed, 18 Jan 2017 15:48:54 +0000 Subject: [PATCH] erp5_knowledge_pad: Fix inconsistency with preferred_height and preferred_width in google_search gadget ERP5Type.ConsistencyMessage for PropertyTypeValidity type_check on portal_gadgets/google_search (message: Attribute preferred_width should be of type string but is of type <type 'int'>) ERP5Type.ConsistencyMessage for PropertyTypeValidity type_check on portal_gadgets/google_search (message: Attribute preferred_height should be of type string but is of type <type 'int'>) --- .../portal_gadgets/google_search.xml | 96 ++++++++++++++++++- .../my_preferred_height.xml | 2 +- .../my_preferred_width.xml | 2 +- 3 files changed, 95 insertions(+), 5 deletions(-) diff --git a/bt5/erp5_knowledge_pad/PathTemplateItem/portal_gadgets/google_search.xml b/bt5/erp5_knowledge_pad/PathTemplateItem/portal_gadgets/google_search.xml index 421cf59663..c53793af3b 100644 --- a/bt5/erp5_knowledge_pad/PathTemplateItem/portal_gadgets/google_search.xml +++ b/bt5/erp5_knowledge_pad/PathTemplateItem/portal_gadgets/google_search.xml @@ -179,7 +179,7 @@ </item> <item> <key> <string>preferred_height</string> </key> - <value> <int>77</int> </value> + <value> <string>77</string> </value> </item> <item> <key> <string>preferred_title</string> </key> @@ -187,7 +187,7 @@ </item> <item> <key> <string>preferred_width</string> </key> - <value> <int>280</int> </value> + <value> <string>280</string> </value> </item> <item> <key> <string>render_type</string> </key> @@ -302,7 +302,7 @@ <value> <object> <klass> - <global name="DateTime" module="DateTime.DateTime"/> + <global id="6.1" name="DateTime" module="DateTime.DateTime"/> </klass> <tuple> <none/> @@ -317,6 +317,96 @@ </value> </item> </dictionary> + <dictionary> + <item> + <key> <string>action</string> </key> + <value> <string>edit</string> </value> + </item> + <item> + <key> <string>actor</string> </key> + <value> <string>zope</string> </value> + </item> + <item> + <key> <string>comment</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>error_message</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>serial</string> </key> + <value> <string>956.47494.7448.44612</string> </value> + </item> + <item> + <key> <string>state</string> </key> + <value> <string>current</string> </value> + </item> + <item> + <key> <string>time</string> </key> + <value> + <object> + <klass> <reference id="6.1"/> </klass> + <tuple> + <none/> + </tuple> + <state> + <tuple> + <float>1484754268.88</float> + <string>UTC</string> + </tuple> + </state> + </object> + </value> + </item> + </dictionary> + <dictionary> + <item> + <key> <string>action</string> </key> + <value> <string>edit</string> </value> + </item> + <item> + <key> <string>actor</string> </key> + <value> <string>zope</string> </value> + </item> + <item> + <key> <string>comment</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>error_message</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>serial</string> </key> + <value> <string>956.47494.7448.44612</string> </value> + </item> + <item> + <key> <string>state</string> </key> + <value> <string>current</string> </value> + </item> + <item> + <key> <string>time</string> </key> + <value> + <object> + <klass> <reference id="6.1"/> </klass> + <tuple> + <none/> + </tuple> + <state> + <tuple> + <float>1484754349.84</float> + <string>UTC</string> + </tuple> + </state> + </object> + </value> + </item> + </dictionary> </list> </tuple> </pickle> diff --git a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/ERP5Site_viewGoogleSearchGadgetPreferenceDialog/my_preferred_height.xml b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/ERP5Site_viewGoogleSearchGadgetPreferenceDialog/my_preferred_height.xml index de83868ab0..4db08b363a 100644 --- a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/ERP5Site_viewGoogleSearchGadgetPreferenceDialog/my_preferred_height.xml +++ b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/ERP5Site_viewGoogleSearchGadgetPreferenceDialog/my_preferred_height.xml @@ -78,7 +78,7 @@ </item> <item> <key> <string>field_id</string> </key> - <value> <string>my_gadget_preferences_integer_field</string> </value> + <value> <string>my_gadget_preferences_string_field</string> </value> </item> <item> <key> <string>form_id</string> </key> diff --git a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/ERP5Site_viewGoogleSearchGadgetPreferenceDialog/my_preferred_width.xml b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/ERP5Site_viewGoogleSearchGadgetPreferenceDialog/my_preferred_width.xml index fd92138fe8..f0249e9aaf 100644 --- a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/ERP5Site_viewGoogleSearchGadgetPreferenceDialog/my_preferred_width.xml +++ b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_gadget/ERP5Site_viewGoogleSearchGadgetPreferenceDialog/my_preferred_width.xml @@ -78,7 +78,7 @@ </item> <item> <key> <string>field_id</string> </key> - <value> <string>my_gadget_preferences_integer_field</string> </value> + <value> <string>my_gadget_preferences_string_field</string> </value> </item> <item> <key> <string>form_id</string> </key> -- 2.30.9