diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-02-19 17:32:31 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-02-19 17:32:31 +0100 |
| commit | 61483e1a25499664df671dbc1738402407c286aa (patch) | |
| tree | ff72e320c4ebdb7104a0f2e9cea3e3977d0575e8 /addons/web/static/src/js/view_form.js | |
| parent | 71f41f7c35541af6cd4c5d955413cd056092e61c (diff) | |
| parent | 9333c622e967207dd6fc9ee23513af9769fc9ee1 (diff) | |
[MERGE] forward port of branch 8.0 up to 9333c62
Diffstat (limited to 'addons/web/static/src/js/view_form.js')
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index b01c8090491..95472605143 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3478,7 +3478,7 @@ instance.web.form.M2ODialog = instance.web.Dialog.extend({ var text = _.str.sprintf(_t("You are creating a new %s, are you sure it does not exist yet?"), self.name); this.$("p").text( text ); this.$buttons.html(QWeb.render("M2ODialog.buttons")); - this.$("input").val(this.getParent().last_query); + this.$("input").val(this.getParent().$input.val()); this.$buttons.find(".oe_form_m2o_qc_button").click(function(e){ if (self.$("input").val() != ''){ self.getParent()._quick_create(self.$("input").val()); @@ -3660,13 +3660,13 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc self.display_value_backup = {}; self.display_value["" + self.last_search[0][0]] = self.last_search[0][1]; self.reinit_value(self.last_search[0][0]); + self.last_search = [] } else { used = true; self.render_value(); } } else { used = true; - self.reinit_value(false); } self.floating = false; } @@ -3740,7 +3740,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc // disabled to solve a bug, but may cause others //close: anyoneLoosesFocus, minLength: 0, - delay: 250, + delay: 200, }); var appendTo = this.$input.parents('.oe-view-manager-content, .modal-dialog').last(); if (appendTo.length === 0) { |
