From 9d46973e47271df78ad15d421e112147cd3bba4f Mon Sep 17 00:00:00 2001 From: Arnaud Fontaine <arnaud.fontaine@nexedi.com> Date: Fri, 7 Feb 2014 15:59:46 +0900 Subject: [PATCH] erp5_autocompletion_ui: Autocompletion property value set to the field should be the one queried from the Catalog. --- .../erp5_autocompletion_ui/Base_getCompletionDict.xml | 1 - .../erp5_autocompletion_ui/ERP5Site_getCompletionDictList.xml | 4 +++- bt5/erp5_autocompletion_ui/bt/change_log | 3 +++ bt5/erp5_autocompletion_ui/bt/revision | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/bt5/erp5_autocompletion_ui/SkinTemplateItem/portal_skins/erp5_autocompletion_ui/Base_getCompletionDict.xml b/bt5/erp5_autocompletion_ui/SkinTemplateItem/portal_skins/erp5_autocompletion_ui/Base_getCompletionDict.xml index 8d5ec2e4ab..51df72a045 100644 --- a/bt5/erp5_autocompletion_ui/SkinTemplateItem/portal_skins/erp5_autocompletion_ui/Base_getCompletionDict.xml +++ b/bt5/erp5_autocompletion_ui/SkinTemplateItem/portal_skins/erp5_autocompletion_ui/Base_getCompletionDict.xml @@ -51,7 +51,6 @@ <item> <key> <string>_body</string> </key> <value> <string>return {\'label\': obj.getTitle(),\n - \'value\': obj.getTitle(),\n \'description\': obj.getRelativeUrl()}\n </string> </value> </item> diff --git a/bt5/erp5_autocompletion_ui/SkinTemplateItem/portal_skins/erp5_autocompletion_ui/ERP5Site_getCompletionDictList.xml b/bt5/erp5_autocompletion_ui/SkinTemplateItem/portal_skins/erp5_autocompletion_ui/ERP5Site_getCompletionDictList.xml index 55e3f4cd17..dce5f99f12 100644 --- a/bt5/erp5_autocompletion_ui/SkinTemplateItem/portal_skins/erp5_autocompletion_ui/ERP5Site_getCompletionDictList.xml +++ b/bt5/erp5_autocompletion_ui/SkinTemplateItem/portal_skins/erp5_autocompletion_ui/ERP5Site_getCompletionDictList.xml @@ -63,10 +63,12 @@ for brain in context.portal_catalog(**kw):\n obj = brain.getObject()\n \n # There may be objects with different Portal Types, so the only way seems\n - # to call the script for each object...\n + # to call the script for each object... The returned dict should only contains\n + # \'label\' (first line displayed) and \'description\' (optional: second line displayed)\n result_dict = obj.getTypeBasedMethod(\'getCompletionDict\',\n fallback_script_id=\'Base_getCompletionDict\')(obj)\n \n + result_dict[\'value\'] = obj.getProperty(search_catalog_key)\n result_dict_list.append(result_dict)\n \n from json import dumps\n diff --git a/bt5/erp5_autocompletion_ui/bt/change_log b/bt5/erp5_autocompletion_ui/bt/change_log index e53041178e..c652526179 100644 --- a/bt5/erp5_autocompletion_ui/bt/change_log +++ b/bt5/erp5_autocompletion_ui/bt/change_log @@ -1,3 +1,6 @@ +2014-02-07 arnaud.fontaine +* Autocompletion property value set to the field should be the one queried from the Catalog. + 2014-02-07 arnaud.fontaine * Consider that description may not be needed, thus only one line, the label, is displayed. diff --git a/bt5/erp5_autocompletion_ui/bt/revision b/bt5/erp5_autocompletion_ui/bt/revision index 19c7bdba7b..8e2afd3427 100644 --- a/bt5/erp5_autocompletion_ui/bt/revision +++ b/bt5/erp5_autocompletion_ui/bt/revision @@ -1 +1 @@ -16 \ No newline at end of file +17 \ No newline at end of file -- 2.30.9