diff options
Diffstat (limited to 'addons/web/static')
| -rw-r--r-- | addons/web/static/lib/qweb/qweb2.js | 3 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/form_view.js | 8 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/form_widgets.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/list_view_editable.js | 3 |
4 files changed, 11 insertions, 5 deletions
diff --git a/addons/web/static/lib/qweb/qweb2.js b/addons/web/static/lib/qweb/qweb2.js index 1ea73e6278e..1e854a6960c 100644 --- a/addons/web/static/lib/qweb/qweb2.js +++ b/addons/web/static/lib/qweb/qweb2.js @@ -327,7 +327,8 @@ QWeb2.Engine = (function() { if (self.tools.trim(text_node.nodeValue)) { return self.tools.exception("Error: text is not allowed between branching directives"); } - text_node.remove(); + // IE <= 11.0 doesn't support ChildNode.remove + text_node.parentNode.removeChild(text_node); } } else { return self.tools.exception("Error: t-elif and t-else directives must be preceded by a t-if or t-elif directive"); diff --git a/addons/web/static/src/js/views/form_view.js b/addons/web/static/src/js/views/form_view.js index 485fad9c914..dc4df281c4d 100644 --- a/addons/web/static/src/js/views/form_view.js +++ b/addons/web/static/src/js/views/form_view.js @@ -639,11 +639,11 @@ var FormView = View.extend(common.FieldManagerMixin, { } }, disable_button: function () { - this.$('.oe_form_buttons').add(this.$buttons).find('button').addClass('o_disabled').prop('disabled', true); + this.$('.oe_form_buttons,.o_statusbar_buttons').add(this.$buttons).find('button').addClass('o_disabled').prop('disabled', true); this.is_disabled = true; }, enable_button: function () { - this.$('.oe_form_buttons').add(this.$buttons).find('button.o_disabled').removeClass('o_disabled').prop('disabled', false); + this.$('.oe_form_buttons,.o_statusbar_buttons').add(this.$buttons).find('button.o_disabled').removeClass('o_disabled').prop('disabled', false); this.is_disabled = false; }, on_button_save: function() { @@ -657,8 +657,10 @@ var FormView = View.extend(common.FieldManagerMixin, { return self.reload().then(function() { self.to_view_mode(); core.bus.trigger('form_view_saved', self); + }).always(function() { + self.enable_button(); }); - }).always(function(){ + }).fail(function(){ self.enable_button(); }); }, diff --git a/addons/web/static/src/js/views/form_widgets.js b/addons/web/static/src/js/views/form_widgets.js index 27d986cdc3c..b644a79ba22 100644 --- a/addons/web/static/src/js/views/form_widgets.js +++ b/addons/web/static/src/js/views/form_widgets.js @@ -202,7 +202,7 @@ var KanbanSelection = common.AbstractField.extend({ prepare_dropdown_selection: function() { var self = this; var _data = []; - var current_stage_id = self.view.datarecord.stage_id[0]; + var current_stage_id = self.view.datarecord.stage_id && self.view.datarecord.stage_id[0]; var stage_data = { id: current_stage_id, legend_normal: self.view.datarecord.legend_normal || undefined, diff --git a/addons/web/static/src/js/views/list_view_editable.js b/addons/web/static/src/js/views/list_view_editable.js index 003b6f18d01..c3b2209c477 100644 --- a/addons/web/static/src/js/views/list_view_editable.js +++ b/addons/web/static/src/js/views/list_view_editable.js @@ -641,6 +641,9 @@ ListView.include(/** @lends instance.web.ListView# */{ if (saveInfo.created) { return self.start_edition(); } + if (!options) { + options = {}; + } options.wraparound = !self.is_action_enabled('create'); var record = self.records[next_record](saveInfo.record, options); if (record === undefined) { |