diff options
| author | Christophe Simonis <chs@openerp.com> | 2014-04-24 15:45:33 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2014-04-24 15:45:33 +0200 |
| commit | 7a7d7febf8d51cdc693e77678fc9eaee3864b3b2 (patch) | |
| tree | d2bb635b1441f04267727e39a4bfbd219a4b7b6b /addons/web | |
| parent | 96b9d8b9d59dc7b240a096e6c6775c7a45ac88c4 (diff) | |
| parent | 52cfc16c2e2f33395a53b255825a8153ec80ce40 (diff) | |
[MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1
bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
Diffstat (limited to 'addons/web')
| -rw-r--r-- | addons/web/static/src/js/search.js | 5 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 251f1977332..832faa4ca62 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1609,8 +1609,11 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({ return facetValue.get('label'); }, make_domain: function (name, operator, facetValue) { - if (operator === this.default_operator) { + switch(operator){ + case this.default_operator: return [[name, '=', facetValue.get('value')]]; + case 'child_of': + return [[name, 'child_of', facetValue.get('value')]]; } return this._super(name, operator, facetValue); }, diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 13a357a1d82..2a495c397e0 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3471,7 +3471,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc self.display_value_backup = {}; self.render_value(); self.focus(); - self.view.do_onchange(self); + self.trigger('changed_value'); }); }); }); |