summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorNicolas Lempereur <nle@odoo.com>2015-09-22 16:45:21 +0200
committerOlivier Dony <odo@openerp.com>2015-09-22 17:41:21 +0200
commit17ce3fafb289266ed215378dddae29df4d5a5279 (patch)
tree7c29e2eb994a10c8f7e3c213960fecba925cb4ad /addons/web/static/src
parent0d1240684aa7b9992c313290b1fc594802aee6e8 (diff)
[FIX] web: m2m tags, wait for deferred
We have to wait that the request getting the fields data is resolved before using it. Completing 655b13b0
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/views/form_relational_widgets.js21
1 files changed, 11 insertions, 10 deletions
diff --git a/addons/web/static/src/js/views/form_relational_widgets.js b/addons/web/static/src/js/views/form_relational_widgets.js
index 73e68fedf9c..428a2fe4758 100644
--- a/addons/web/static/src/js/views/form_relational_widgets.js
+++ b/addons/web/static/src/js/views/form_relational_widgets.js
@@ -1467,17 +1467,18 @@ var FieldMany2ManyTags = AbstractManyField.extend(common.CompletionFieldMixin, c
}
},
open_color_picker: function(ev){
+ this.mutex.exec(function(){
+ if (this.fields.color) {
+ this.$color_picker = $(QWeb.render('FieldMany2ManyTag.colorpicker', {
+ 'widget': this,
+ 'tag_id': $(ev.currentTarget).data('id'),
+ }));
- if (this.fields.color) {
- this.$color_picker = $(QWeb.render('FieldMany2ManyTag.colorpicker', {
- 'widget': this,
- 'tag_id': $(ev.currentTarget).data('id'),
- }));
-
- $(ev.currentTarget).append(this.$color_picker);
- this.$color_picker.dropdown('toggle');
- this.$color_picker.attr("tabindex", 1).focus();
- }
+ $(ev.currentTarget).append(this.$color_picker);
+ this.$color_picker.dropdown('toggle');
+ this.$color_picker.attr("tabindex", 1).focus();
+ }
+ }.bind(this));
},
close_color_picker: function(){
this.$color_picker.remove();