From 57774b6e3eb95a95b5404529f983578da45f35ff Mon Sep 17 00:00:00 2001 From: jesusVMayor Date: Tue, 30 May 2017 13:27:24 +0200 Subject: [PATCH 1/2] [IMP] web_m2x_options: Perf issue https://github.com/OCA/web/issues/615 * fix unecessary calls Do check_access_rights and disable_quick_create calls only once per field. --- web_m2x_options/static/src/js/form.js | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/web_m2x_options/static/src/js/form.js b/web_m2x_options/static/src/js/form.js index 4fb83da3..ba649532 100644 --- a/web_m2x_options/static/src/js/form.js +++ b/web_m2x_options/static/src/js/form.js @@ -113,7 +113,7 @@ odoo.define('web_m2x_options.web_m2x_options', function (require) { if (_.isUndefined(this.view)) return this._super.apply(this, arguments); if (!_.isUndefined(this.view.ir_options['web_m2x_options.limit'])) { - this.limit = parseInt(this.view.ir_options['web_m2x_options.limit']); + this.limit = parseInt(this.view.ir_options['web_m2x_options.limit'], 10); } if (typeof this.options.limit === 'number') { @@ -136,13 +136,14 @@ odoo.define('web_m2x_options.web_m2x_options', function (require) { 'ilike', this.limit + 1, self.build_context())); - var create_rights; if (!(self.options && (self.is_option_set(self.options.create) || self.is_option_set(self.options.create_edit)))) { - create_rights = new Model(this.field.relation).call( + this.create_rights = this.create_rights || (function(){ + return new Model(self.field.relation).call( "check_access_rights", ["create", false]); + })(); } - $.when(search_result, create_rights).then(function (data, can_create) { + $.when(search_result, this.create_rights).then(function (data, can_create) { self.can_create = can_create; // for ``.show_error_displayer()`` self.last_search = data; @@ -202,7 +203,7 @@ odoo.define('web_m2x_options.web_m2x_options', function (require) { self._search_create_popup("search", data); }); }, - classname: 'oe_m2o_dropdown_option o_m2o_dropdown_option' + classname: 'oe_m2o_dropdown_option o_m2o_dropdown_option' }); } @@ -227,7 +228,7 @@ odoo.define('web_m2x_options.web_m2x_options', function (require) { action: function () { self._quick_create(search_val); }, - classname: 'oe_m2o_dropdown_option o_m2o_dropdown_option' + classname: 'oe_m2o_dropdown_option o_m2o_dropdown_option' }); } } @@ -246,7 +247,7 @@ odoo.define('web_m2x_options.web_m2x_options', function (require) { "form", undefined, self._create_context(search_val)); }, - classname: 'oe_m2o_dropdown_option o_m2o_dropdown_option' + classname: 'oe_m2o_dropdown_option o_m2o_dropdown_option' }); } // Check if colors specified to wait for RPC @@ -318,7 +319,7 @@ odoo.define('web_m2x_options.web_m2x_options', function (require) { // returned. if (!_.isUndefined(this.view.ir_options['web_m2x_options.limit'])) { - this.limit = parseInt(this.view.ir_options['web_m2x_options.limit']); + this.limit = parseInt(this.view.ir_options['web_m2x_options.limit'], 10); } if (typeof this.options.limit === 'number') { @@ -358,7 +359,7 @@ odoo.define('web_m2x_options.web_m2x_options', function (require) { self._search_create_popup("search", data); }); }, - classname: 'oe_m2o_dropdown_option o_m2o_dropdown_option' + classname: 'oe_m2o_dropdown_option o_m2o_dropdown_option' }); } // quick create @@ -377,7 +378,7 @@ odoo.define('web_m2x_options.web_m2x_options', function (require) { action: function() { self._quick_create(search_val); }, - classname: 'oe_m2o_dropdown_option o_m2o_dropdown_option' + classname: 'oe_m2o_dropdown_option o_m2o_dropdown_option' }); } } @@ -395,7 +396,7 @@ odoo.define('web_m2x_options.web_m2x_options', function (require) { action: function() { self._search_create_popup("form", undefined, self._create_context(search_val)); }, - classname: 'oe_m2o_dropdown_option o_m2o_dropdown_option' + classname: 'oe_m2o_dropdown_option o_m2o_dropdown_option' }); } @@ -408,7 +409,7 @@ odoo.define('web_m2x_options.web_m2x_options', function (require) { var open = (self.options && self.is_option_set(self.options.open)); if(open){ self.mutex.exec(function(){ - var id = parseInt($(ev.currentTarget).data('id')); + var id = parseInt($(ev.currentTarget).data('id'), 10); self.do_action({ type: 'ir.actions.act_window', res_model: self.field.relation, From e37db6412aa4ca85c8ad1635c49e9150a202f5af Mon Sep 17 00:00:00 2001 From: jesusVMayor Date: Tue, 30 May 2017 16:18:24 +0200 Subject: [PATCH 2/2] web_m2x_options: Hide the create/create and edit... button when the user does not have creation permission. --- web_m2x_options/static/src/js/form.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web_m2x_options/static/src/js/form.js b/web_m2x_options/static/src/js/form.js index ba649532..4fde71c4 100644 --- a/web_m2x_options/static/src/js/form.js +++ b/web_m2x_options/static/src/js/form.js @@ -217,7 +217,7 @@ odoo.define('web_m2x_options.web_m2x_options', function (require) { m2x_create_undef = _.isUndefined(self.view.ir_options['web_m2x_options.create']), m2x_create = self.is_option_set(self.view.ir_options['web_m2x_options.create']); var show_create = (!self.options && (m2x_create_undef || m2x_create)) || (self.options && (quick_create || (quick_create_undef && (m2x_create_undef || m2x_create)))); - if (show_create){ + if (self.can_create && show_create){ if (search_val.length > 0 && !_.include(raw_result, search_val)) { @@ -239,7 +239,7 @@ odoo.define('web_m2x_options.web_m2x_options', function (require) { m2x_create_edit_undef = _.isUndefined(self.view.ir_options['web_m2x_options.create_edit']), m2x_create_edit = self.is_option_set(self.view.ir_options['web_m2x_options.create_edit']); var show_create_edit = (!self.options && (m2x_create_edit_undef || m2x_create_edit)) || (self.options && (create_edit || (create_edit_undef && (m2x_create_edit_undef || m2x_create_edit)))); - if (show_create_edit){ + if (self.can_create && show_create_edit){ values.push({ label: _t("Create and Edit..."), action: function () {