diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-11-02 13:44:53 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-11-02 13:44:53 +0100 |
| commit | 9a32dacd8c30860b24ea191f16f7d0ade6d9c3b2 (patch) | |
| tree | 6fe30958ff15bbd759563d06f0b6a1813d95247a /addons/web/static/src/js | |
| parent | dafc3fb7928b3e1325d61060f7402fb148675347 (diff) | |
| parent | ee2b9fae3519c2494f34dacf15d0a3b5bd8fbd06 (diff) | |
[MERGE] forward port branch 11.0 up to ee2b9fae351
Diffstat (limited to 'addons/web/static/src/js')
| -rw-r--r-- | addons/web/static/src/js/fields/relational_fields.js | 13 | ||||
| -rw-r--r-- | addons/web/static/src/js/widgets/model_field_selector.js | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/addons/web/static/src/js/fields/relational_fields.js b/addons/web/static/src/js/fields/relational_fields.js index f2cacb3327f..ae3080b3b8e 100644 --- a/addons/web/static/src/js/fields/relational_fields.js +++ b/addons/web/static/src/js/fields/relational_fields.js @@ -534,14 +534,17 @@ var FieldMany2One = AbstractField.extend({ * start/end of the input element. Stops any navigation move event if the * user is selecting text. * - * TODO this is a duplicate of InputField._onNavigationMove, maybe this - * should be done in a mixin or, better, the m2o field should be an - * InputField (but this requires some refactoring). - * * @private * @param {OdooEvent} ev */ - _onNavigationMove: basicFields.InputField.prototype._onNavigationMove, + _onNavigationMove: function (ev) { + // TODO Maybe this should be done in a mixin or, better, the m2o field + // should be an InputField (but this requires some refactoring). + basicFields.InputField.prototype._onNavigationMove.apply(this, arguments); + if (this.mode === 'edit' && $(this.$input.autocomplete('widget')).is(':visible')) { + ev.stopPropagation(); + } + }, /** * @private * @param {OdooEvent} event diff --git a/addons/web/static/src/js/widgets/model_field_selector.js b/addons/web/static/src/js/widgets/model_field_selector.js index a8daa781119..b82c2ed1963 100644 --- a/addons/web/static/src/js/widgets/model_field_selector.js +++ b/addons/web/static/src/js/widgets/model_field_selector.js @@ -257,7 +257,7 @@ var ModelFieldSelector = Widget.extend({ if (this.dirty) { this.dirty = false; - this.pages = this.pages.slice(0, this.chain.length); + this.pages = this.pages.slice(0, this.chain.length || 1); this.trigger_up("field_chain_changed", {chain: this.chain}); } }, |