From 49657b28e6915c46342a509e7b4c1e62645e16d4 Mon Sep 17 00:00:00 2001 From: etenesaca Date: Tue, 20 May 2014 14:58:40 -0500 Subject: [PATCH 1/3] Now when a search is conducted in the fields and not m2o results have a message saying "No results to show" since the show nothing will display the user is confused --- addons/web/static/src/js/view_form.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 4c4ba6f004c..582ddd7597e 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3394,6 +3394,11 @@ instance.web.form.CompletionFieldMixin = { classname: 'oe_m2o_dropdown_option' }); } + else if (values.length == 0) + values.push({ + label: "
" + _t("No results to show...") + "
", + action: function() {}, + }); return values; }); From bd8b2e9002194c08f4828c9a29ef8af3bc2f64e1 Mon Sep 17 00:00:00 2001 From: etenesaca Date: Tue, 20 May 2014 21:16:52 -0500 Subject: [PATCH 2/3] Optimized search fields from m2o Added translation of the message Now this style of message in a CSS class and not use HTML tags --- addons/web/i18n/es.po | 7 +++++++ addons/web/static/src/css/base.css | 4 ++++ addons/web/static/src/js/view_form.js | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/addons/web/i18n/es.po b/addons/web/i18n/es.po index b43baf25b21..9be938168dc 100644 --- a/addons/web/i18n/es.po +++ b/addons/web/i18n/es.po @@ -1292,6 +1292,13 @@ msgstr "Agrupar por: %s" msgid "No data provided." msgstr "No se han facilitado datos" +#. module: web +#. openerp-web +#: code:addons/web/static/src/js/view_form.js:3399 +#, python-format +msgid "No results to show..." +msgstr "No hay resultados para mostrar..." + #. module: web #. openerp-web #: code:addons/web/static/src/js/view_list.js:345 diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index f02dc3c7fd7..b6d12b38688 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2409,6 +2409,10 @@ .openerp .oe_form_field_many2one input { padding-right: 13px; } +.openerp.ui-autocomplete li.oe_m2o_dropdown_option_no_results_to_show a { + font-style: italic; + text-align: center; +} .openerp.ui-autocomplete li.oe_m2o_dropdown_option a { font-style: italic; padding-left: 2em; diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 582ddd7597e..14cd0551fd4 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3396,8 +3396,9 @@ instance.web.form.CompletionFieldMixin = { } else if (values.length == 0) values.push({ - label: "
" + _t("No results to show...") + "
", + label: _t("No results to show..."), action: function() {}, + classname: 'oe_m2o_dropdown_option_no_results_to_show' }); return values; From 2097af20b78c71d464eadc7dafee40f2ad87b9b4 Mon Sep 17 00:00:00 2001 From: etenesaca Date: Mon, 26 May 2014 11:51:24 -0500 Subject: [PATCH 3/3] * Deleted: oe_m2o_dropdown_option_no_results_to_show AND REUSED oe_m2o_dropdown_option * Deleted: manually translation in es.po --- addons/web/i18n/es.po | 7 ------- addons/web/static/src/css/base.css | 4 ---- addons/web/static/src/js/view_form.js | 2 +- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/addons/web/i18n/es.po b/addons/web/i18n/es.po index 9be938168dc..b43baf25b21 100644 --- a/addons/web/i18n/es.po +++ b/addons/web/i18n/es.po @@ -1292,13 +1292,6 @@ msgstr "Agrupar por: %s" msgid "No data provided." msgstr "No se han facilitado datos" -#. module: web -#. openerp-web -#: code:addons/web/static/src/js/view_form.js:3399 -#, python-format -msgid "No results to show..." -msgstr "No hay resultados para mostrar..." - #. module: web #. openerp-web #: code:addons/web/static/src/js/view_list.js:345 diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index b6d12b38688..f02dc3c7fd7 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2409,10 +2409,6 @@ .openerp .oe_form_field_many2one input { padding-right: 13px; } -.openerp.ui-autocomplete li.oe_m2o_dropdown_option_no_results_to_show a { - font-style: italic; - text-align: center; -} .openerp.ui-autocomplete li.oe_m2o_dropdown_option a { font-style: italic; padding-left: 2em; diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 14cd0551fd4..ffe9d268240 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3398,7 +3398,7 @@ instance.web.form.CompletionFieldMixin = { values.push({ label: _t("No results to show..."), action: function() {}, - classname: 'oe_m2o_dropdown_option_no_results_to_show' + classname: 'oe_m2o_dropdown_option' }); return values;