From 68cb2ade09206b0abb3f7c8dccb5d35a6499f802 Mon Sep 17 00:00:00 2001 From: Nicolas Seinlet Date: Wed, 29 Nov 2017 10:40:40 +0100 Subject: [PATCH] [IMP] base_import: defer parent store Makes possible to choose `defer_parent_store_computation` in UI. Closes #21320 --- addons/base_import/static/src/js/import_action.js | 5 ++++- addons/base_import/static/src/xml/base_import.xml | 9 +++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/addons/base_import/static/src/js/import_action.js b/addons/base_import/static/src/js/import_action.js index c82704bc76f..9c6d5563400 100644 --- a/addons/base_import/static/src/js/import_action.js +++ b/addons/base_import/static/src/js/import_action.js @@ -316,6 +316,7 @@ var DataImport = Widget.extend(ControlPanelMixin, { this.$('.oe_import_float_decimal_separator').val(result.options.float_decimal_separator).change(); if (result.debug === false){ this.$('.oe_import_tracking').hide(); + this.$('.oe_import_deferparentstore').hide(); } var $fields = this.$('.oe_import_fields input'); @@ -454,10 +455,12 @@ var DataImport = Widget.extend(ControlPanelMixin, { return $(el).select2('val') || false; }).get(); var tracking_disable = 'tracking_disable' in kwargs ? kwargs.tracking_disable : !this.$('#oe_import_tracking').prop('checked') + var defer_parent_store = 'defer_parent_store' in kwargs ? kwargs.defer_parent_store : !!this.$('#oe_import_deferparentstore').prop('checked') delete kwargs.tracking_disable; + delete kwargs.defer_parent_store; kwargs.context = _.extend( {}, this.parent_context, - {tracking_disable: tracking_disable} + {tracking_disable: tracking_disable, defer_parent_store_computation: defer_parent_store} ); return this._rpc({ model: 'base_import.import', diff --git a/addons/base_import/static/src/xml/base_import.xml b/addons/base_import/static/src/xml/base_import.xml index 5ee60a28407..42fb892c60f 100644 --- a/addons/base_import/static/src/xml/base_import.xml +++ b/addons/base_import/static/src/xml/base_import.xml @@ -63,6 +63,15 @@ Track history during import +
+ + +