From e4c3847eb752f9e539abd9461cf2679445fba595 Mon Sep 17 00:00:00 2001 From: Kersten Jeremy Date: Tue, 11 Mar 2014 18:35:19 +0100 Subject: [FIX] remove test commits bzr revid: jke@openerp.com-20140311173519-kdk52vqcrl25r6g6 --- addons/web/static/src/js/testing.js | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'addons/web/static/src') diff --git a/addons/web/static/src/js/testing.js b/addons/web/static/src/js/testing.js index 1b75e136dbb..c4f5aeebd60 100644 --- a/addons/web/static/src/js/testing.js +++ b/addons/web/static/src/js/testing.js @@ -50,19 +50,12 @@ openerp.testing = {}; testing.current_module = null; testing.templates = { }; testing.add_template = function (name) { - try { - console.log(name + " loading ..."); - var xhr = window.QWeb2.Engine.prototype.get_xhr(); - console.log(name + " loaded ..."); - xhr.open('GET', name, false); - xhr.send(null); - (testing.templates[testing.current_module] = - testing.templates[testing.current_module] || []) - .push(xhr.responseXML); - } - catch(e) { - console.log(name + " ERRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRROOOOR"); - } + var xhr = QWeb2.Engine.prototype.get_xhr(); + xhr.open('GET', name, false); + xhr.send(null); + (testing.templates[testing.current_module] = + testing.templates[testing.current_module] || []) + .push(xhr.responseXML); }; /** * Function which does not do anything -- cgit v1.2.3 From 477a87e2b1127011bd41b6c05342b9163638ddf6 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Thu, 13 Mar 2014 19:20:04 +0100 Subject: [FIX] web: widget selection on many2one in search view is deprecated, it was used in some cases but it is now pointless as the basic many2one handle these cases bzr revid: dle@openerp.com-20140313182004-symalqn8m9offm14 --- addons/web/static/src/js/search.js | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'addons/web/static/src') diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index b667d135bdd..ae5f1bfb958 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -677,6 +677,11 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea * @returns instance.web.search.Field */ make_field: function (item, field, parent) { + // M2O combined with selection widget is pointless and broken in search views, + // but has been used in the past for unsupported hacks -> ignore it + if (field.type === "many2one" && item.attrs.widget === "selection"){ + item.attrs.widget = undefined; + } var obj = instance.web.search.fields.get_any( [item.attrs.widget, field.type]); if(obj) { return new (obj) (item, field, parent || this); -- cgit v1.2.3