From 7040fb35dd8fcba26ca74566fa0d64e7ef07ffbb Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 15 Oct 2013 10:55:23 +0200 Subject: [FIX] double-escaping of section labels in m2o completion bzr revid: xmo@openerp.com-20131015085523-5s5f587486gaa9zj --- addons/web/static/src/js/search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/web/static/src/js/search.js') diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 07d1407392e..570c17649c1 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1547,7 +1547,7 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({ context: context }).then(function (results) { if (_.isEmpty(results)) { return null; } - return [{label: _.escape(self.attrs.string)}].concat( + return [{label: self.attrs.string}].concat( _(results).map(function (result) { return { label: _.escape(result[1]), -- cgit v1.2.3 From 752341f0cb0bb4c77591d66aa9570bdaabbd1b4e Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Tue, 22 Oct 2013 18:25:19 +0200 Subject: [FIX]web: filter name input for custom filters in search dropdown is now required bzr revid: dle@openerp.com-20131022162519-u03cn5k5od8jg6ka --- addons/web/static/src/js/search.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'addons/web/static/src/js/search.js') diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 570c17649c1..78f53506abc 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1733,7 +1733,10 @@ instance.web.search.CustomFilters = instance.web.search.Input.extend({ var $name = this.$('input:first'); var private_filter = !this.$('#oe_searchview_custom_public').prop('checked'); var set_as_default = this.$('#oe_searchview_custom_default').prop('checked'); - + if (_.isEmpty($name.val())){ + this.do_warn(_t("Error"), _t("Filter name is required.")); + return false; + } var search = this.view.build_search_data(); instance.web.pyeval.eval_domains_and_contexts({ domains: search.domains, -- cgit v1.2.3