diff options
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/framework/data.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/form_widgets.js | 14 |
2 files changed, 12 insertions, 4 deletions
diff --git a/addons/web/static/src/js/framework/data.js b/addons/web/static/src/js/framework/data.js index 3e9396a4e96..60df888ea1d 100644 --- a/addons/web/static/src/js/framework/data.js +++ b/addons/web/static/src/js/framework/data.js @@ -688,7 +688,7 @@ var DataSetSearch = DataSet.extend({ .limit(options.limit || false); q = q.order_by.apply(q, this._sort); - return q.all().done(function (records) { + return this.orderer.add(q.all()).done(function (records) { // FIXME: not sure about that one, *could* have discarded count q.count().done(function (count) { self._length = count; }); self.ids = _(records).pluck('id'); diff --git a/addons/web/static/src/js/views/form_widgets.js b/addons/web/static/src/js/views/form_widgets.js index b1f9058c825..8f046859ee8 100644 --- a/addons/web/static/src/js/views/form_widgets.js +++ b/addons/web/static/src/js/views/form_widgets.js @@ -478,6 +478,7 @@ var FieldCharDomain = common.AbstractField.extend(common.ReinitializeFieldMixin, this.$('.o_debug_input').val(this.get('value')); } } else { + this.$('.o_form_input').val(''); this.$('.o_count').text(_t('No selected record')); var $arrow = this.$('button span').detach(); this.$('button').text(_('Select records ')).append($("<span/>").addClass('fa fa-arrow-right')); @@ -1073,7 +1074,7 @@ var FieldRadio = common.AbstractField.extend(common.ReinitializeFieldMixin, { render_value: function () { var self = this; this.$el.toggleClass("oe_readonly", this.get('effective_readonly')); - this.$("input").filter(function () {return this.value == self.get_value();}).prop("checked", true); + this.$("input").prop("checked", false).filter(function () {return this.value == self.get_value();}).prop("checked", true); this.$(".oe_radio_readonly").text(this.get('value') ? this.get('value')[1] : ""); } }); @@ -1528,13 +1529,17 @@ var FieldStatus = common.AbstractField.extend({ return fields; }); }, - on_click_stage: function (ev) { + on_click_stage: _.debounce(function (ev) { var self = this; var $li = $(ev.currentTarget); + var ul = $li.closest('.oe_form_field_status'); if (this.view.is_disabled) { return; } var val; + if (ul.attr('disabled')) { + return; + } if (this.field.type == "many2one") { val = parseInt($li.data("id"), 10); } @@ -1551,13 +1556,16 @@ var FieldStatus = common.AbstractField.extend({ this.view.recursive_save().done(function() { var change = {}; change[self.name] = val; + ul.attr('disabled', true); self.view.dataset.write(self.view.datarecord.id, change).done(function() { self.view.reload(); + }).always(function() { + ul.removeAttr('disabled'); }); }); } } - }, + }, 300), }); var FieldMonetary = FieldFloat.extend({ |