Techsystech
/
web
mirror of https://github.com/OCA/web.git
3
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

[MIG] web_m2x_options: Migration to 13.0

pull/1392/head
Jeroen Evens 2019-10-02 15:02:18 +02:00
parent d97392e20b
commit fbcad35c32
3 changed files with 149 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web_m2x_options/__manifest__.py
View File

@ -5,7 +5,7 @@
{
"name": 'web_m2x_options',
"version": "12.0.1.0.0",
"version": "13.0.1.0.0",
'category': 'Web',
"author": "ACSONE SA/NV, "
"0k.io, "

4
web_m2x_options/readme/CONTRIBUTORS.rst
View File

@ -4,8 +4,8 @@
* Nicolas JEUDY <nicolas@sudokeys.com>
* Yannick Vaucher <yannick.vaucher@camptocamp.com>
* Zakaria Makrelouf <z.makrelouf@gmail.com>
* `Tecnativa <https://www.tecnativa.com>`_:
* Tecnativa <https://www.tecnativa.com>
* Jairo Llopis <jairo.llopis@tecnativa.com>
* David Vidal <david.vidal@tecnativa.com>
* Ernesto Tejeda <ernesto.tejeda87@gmail.com>
* Jeroen Evens <jeroen.evens@dynapps.be>

62
web_m2x_options/static/src/js/form.js
View File

@ -91,7 +91,7 @@ odoo.define('web_m2x_options.web_m2x_options', function (require) {
if (_.isUndefined(this.ir_options_loaded)) {
this.ir_options_loaded = $.Deferred();
this.ir_options = {};
web_m2x_options.done(function (records) {
web_m2x_options.then(function (records) {
_(records).each(function(record) {
self.ir_options[record.key] = record.value;
});
@ -120,39 +120,37 @@ odoo.define('web_m2x_options.web_m2x_options', function (require) {
_search: function (search_val) {
var self = this;
var def = $.Deferred();
this.orderer.add(def);
var def = new Promise(function (resolve) {
// add options limit used to change number of selections record
// returned.
if (!_.isUndefined(this.ir_options['web_m2x_options.limit'])) {
this.limit = parseInt(this.ir_options['web_m2x_options.limit'], 10);
if (!_.isUndefined(self.ir_options['web_m2x_options.limit'])) {
self.limit = parseInt(self.ir_options['web_m2x_options.limit'], 10);
}
if (typeof this.nodeOptions.limit === 'number') {
this.limit = this.nodeOptions.limit;
if (typeof self.nodeOptions.limit === 'number') {
self.limit = self.nodeOptions.limit;
}
// add options field_color and colors to color item(s) depending on field_color value
this.field_color = this.nodeOptions.field_color;
this.colors = this.nodeOptions.colors;
self.field_color = self.nodeOptions.field_color;
self.colors = self.nodeOptions.colors;
var context = this.record.getContext(this.recordParams);
var domain = this.record.getDomain(this.recordParams);
var context = self.record.getContext(self.recordParams);
var domain = self.record.getDomain(self.recordParams);
var blacklisted_ids = this._getSearchBlacklist();
var blacklisted_ids = self._getSearchBlacklist();
if (blacklisted_ids.length > 0) {
domain.push(['id', 'not in', blacklisted_ids]);
}
this._rpc({
model: this.field.relation,
self._rpc({
model: self.field.relation,
method: "name_search",
kwargs: {
name: search_val,
args: domain,
operator: "ilike",
limit: this.limit + 1,
limit: self.limit + 1,
context: context,
}
}).then(function (result) {
@ -191,7 +189,7 @@ odoo.define('web_m2x_options.web_m2x_options', function (require) {
}
}
}
def.resolve(values);
resolve(values);
})
}
@ -207,21 +205,33 @@ odoo.define('web_m2x_options.web_m2x_options', function (require) {
values.push({
label: _t("Search More..."),
action: function () {
// limit = 80 for improving performance, similar
// to Odoo implementation here:
// https://github.com/odoo/odoo/commit/8c3cdce539d87775b59b3f2d5ceb433f995821bf
self._rpc({
var prom;
if (search_val !== '') {
prom = self._rpc({
model: self.field.relation,
method: 'name_search',
kwargs: {
name: search_val,
args: domain,
operator: "ilike",
limit: 80,
limit: self.SEARCH_MORE_LIMIT,
context: context,
},
})
.then(self._searchCreatePopup.bind(self, "search"));
});
}
Promise.resolve(prom).then(function (results) {
var dynamicFilters;
if (results) {
var ids = _.map(results, function (x) {
return x[0];
});
dynamicFilters = [{
description: _.str.sprintf(_t('Quick search: %s'), search_val),
domain: [['id', 'in', ids]],
}];
}
self._searchCreatePopup("search", false, {}, dynamicFilters);
});
},
classname: 'o_m2o_dropdown_option',
});
@ -271,10 +281,12 @@ odoo.define('web_m2x_options.web_m2x_options', function (require) {
}
// Check if colors specified to wait for RPC
if (!(self.field_color && self.colors)) {
def.resolve(values);
resolve(values);
}
});
});
this.orderer.add(def);
return def;
}
});