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

Migration of module web_m2x_options. Adapt JS file to the new JS API and make the module installable [MIG] adapt form.js to the new API. [FIX] Fix bug mentioned in pull #262. [MIG] Make the module installable.

pull/2434/head
Zakaria Makrelouf 2016-09-11 12:10:19 +01:00 committed by Diep Huu Hoang
parent 7c6345bd48
commit a060459465
13 changed files with 190 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web_m2x_options/README.rst
View File

@ -145,6 +145,7 @@ Contributors
* Holger Brunn <hbrunn@therp.nl>
* Nicolas JEUDY <nicolas@sudokeys.com>
* Yannick Vaucher <yannick.vaucher@camptocamp.com>
* Zakaria Makrelouf <z.makrelouf@gmail.com>
Maintainer
----------

7
web_m2x_options/__openerp__.py
View File

@ -2,7 +2,7 @@
{
"name": 'web_m2x_options',
"version": "8.0.0.2.0",
"version": "9.0.1.0.0",
"depends": [
'base',
'web',
@ -12,7 +12,6 @@
],
'license': 'AGPL-3',
'data': ['views/view.xml'],
"author": "0k.io,Odoo Community Association (OCA)",
"installable": True,
"active": False,
"author": "ACSONE SA/NV, 0k.io,Odoo Community Association (OCA)",
'installable': True,
}

12
web_m2x_options/i18n/ar.po
View File

@ -20,24 +20,24 @@ msgstr ""
#. module: web_m2x_options
#. openerp-web
#: code:addons/web_m2x_options/static/src/js/form.js:191
#: code:addons/web_m2x_options/static/src/js/form.js:330
#: code:addons/web_m2x_options/static/src/js/form.js:219
#: code:addons/web_m2x_options/static/src/js/form.js:373
#, python-format
msgid "Create \"<strong>%s</strong>\""
msgstr "إنشاء \"<strong>%s</strong>\""
#. module: web_m2x_options
#. openerp-web
#: code:addons/web_m2x_options/static/src/js/form.js:213
#: code:addons/web_m2x_options/static/src/js/form.js:351
#: code:addons/web_m2x_options/static/src/js/form.js:237
#: code:addons/web_m2x_options/static/src/js/form.js:392
#, python-format
msgid "Create and Edit..."
msgstr "إنشاء وتحرير ..."
#. module: web_m2x_options
#. openerp-web
#: code:addons/web_m2x_options/static/src/js/form.js:156
#: code:addons/web_m2x_options/static/src/js/form.js:305
#: code:addons/web_m2x_options/static/src/js/form.js:188
#: code:addons/web_m2x_options/static/src/js/form.js:349
#, python-format
msgid "Search More..."
msgstr "البحث عن المزيد ..."

12
web_m2x_options/i18n/de.po
View File

@ -20,24 +20,24 @@ msgstr ""
#. module: web_m2x_options
#. openerp-web
#: code:addons/web_m2x_options/static/src/js/form.js:191
#: code:addons/web_m2x_options/static/src/js/form.js:330
#: code:addons/web_m2x_options/static/src/js/form.js:219
#: code:addons/web_m2x_options/static/src/js/form.js:373
#, python-format
msgid "Create \"<strong>%s</strong>\""
msgstr "Anlegen \"<strong>%s</strong>"
#. module: web_m2x_options
#. openerp-web
#: code:addons/web_m2x_options/static/src/js/form.js:213
#: code:addons/web_m2x_options/static/src/js/form.js:351
#: code:addons/web_m2x_options/static/src/js/form.js:237
#: code:addons/web_m2x_options/static/src/js/form.js:392
#, python-format
msgid "Create and Edit..."
msgstr "Anlegen und Bearbeiten"
#. module: web_m2x_options
#. openerp-web
#: code:addons/web_m2x_options/static/src/js/form.js:156
#: code:addons/web_m2x_options/static/src/js/form.js:305
#: code:addons/web_m2x_options/static/src/js/form.js:188
#: code:addons/web_m2x_options/static/src/js/form.js:349
#, python-format
msgid "Search More..."
msgstr "Suche weitere..."

12
web_m2x_options/i18n/es.po
View File

@ -20,24 +20,24 @@ msgstr ""
#. module: web_m2x_options
#. openerp-web
#: code:addons/web_m2x_options/static/src/js/form.js:191
#: code:addons/web_m2x_options/static/src/js/form.js:330
#: code:addons/web_m2x_options/static/src/js/form.js:219
#: code:addons/web_m2x_options/static/src/js/form.js:373
#, python-format
msgid "Create \"<strong>%s</strong>\""
msgstr "Crear \"<strong>%s</strong>\""
#. module: web_m2x_options
#. openerp-web
#: code:addons/web_m2x_options/static/src/js/form.js:213
#: code:addons/web_m2x_options/static/src/js/form.js:351
#: code:addons/web_m2x_options/static/src/js/form.js:237
#: code:addons/web_m2x_options/static/src/js/form.js:392
#, python-format
msgid "Create and Edit..."
msgstr "Crear y editar..."
#. module: web_m2x_options
#. openerp-web
#: code:addons/web_m2x_options/static/src/js/form.js:156
#: code:addons/web_m2x_options/static/src/js/form.js:305
#: code:addons/web_m2x_options/static/src/js/form.js:188
#: code:addons/web_m2x_options/static/src/js/form.js:349
#, python-format
msgid "Search More..."
msgstr "Buscar más..."

12
web_m2x_options/i18n/fi.po
View File

@ -20,24 +20,24 @@ msgstr ""
#. module: web_m2x_options
#. openerp-web
#: code:addons/web_m2x_options/static/src/js/form.js:191
#: code:addons/web_m2x_options/static/src/js/form.js:330
#: code:addons/web_m2x_options/static/src/js/form.js:219
#: code:addons/web_m2x_options/static/src/js/form.js:373
#, python-format
msgid "Create \"<strong>%s</strong>\""
msgstr "Luo \"<strong>%s</strong>\""
#. module: web_m2x_options
#. openerp-web
#: code:addons/web_m2x_options/static/src/js/form.js:213
#: code:addons/web_m2x_options/static/src/js/form.js:351
#: code:addons/web_m2x_options/static/src/js/form.js:237
#: code:addons/web_m2x_options/static/src/js/form.js:392
#, python-format
msgid "Create and Edit..."
msgstr "Luo ja muokkaa..."
#. module: web_m2x_options
#. openerp-web
#: code:addons/web_m2x_options/static/src/js/form.js:156
#: code:addons/web_m2x_options/static/src/js/form.js:305
#: code:addons/web_m2x_options/static/src/js/form.js:188
#: code:addons/web_m2x_options/static/src/js/form.js:349
#, python-format
msgid "Search More..."
msgstr "Hae lisää..."

12
web_m2x_options/i18n/fr.po
View File

@ -20,24 +20,24 @@ msgstr ""
#. module: web_m2x_options
#. openerp-web
#: code:addons/web_m2x_options/static/src/js/form.js:191
#: code:addons/web_m2x_options/static/src/js/form.js:330
#: code:addons/web_m2x_options/static/src/js/form.js:219
#: code:addons/web_m2x_options/static/src/js/form.js:373
#, python-format
msgid "Create \"<strong>%s</strong>\""
msgstr "Creer \"<strong>%s</strong>\""
#. module: web_m2x_options
#. openerp-web
#: code:addons/web_m2x_options/static/src/js/form.js:213
#: code:addons/web_m2x_options/static/src/js/form.js:351
#: code:addons/web_m2x_options/static/src/js/form.js:237
#: code:addons/web_m2x_options/static/src/js/form.js:392
#, python-format
msgid "Create and Edit..."
msgstr "Créer et modifier..."
#. module: web_m2x_options
#. openerp-web
#: code:addons/web_m2x_options/static/src/js/form.js:156
#: code:addons/web_m2x_options/static/src/js/form.js:305
#: code:addons/web_m2x_options/static/src/js/form.js:188
#: code:addons/web_m2x_options/static/src/js/form.js:349
#, python-format
msgid "Search More..."
msgstr "Rechercher plus..."

12
web_m2x_options/i18n/it.po
View File

@ -32,24 +32,24 @@ msgstr ""
#. module: web_m2x_options
#. openerp-web
#: code:addons/web_m2x_options/static/src/js/form.js:191
#: code:addons/web_m2x_options/static/src/js/form.js:330
#: code:addons/web_m2x_options/static/src/js/form.js:219
#: code:addons/web_m2x_options/static/src/js/form.js:373
#, python-format
msgid "Create \"<strong>%s</strong>\""
msgstr "Crea \"<strong>%s</strong>\""
#. module: web_m2x_options
#. openerp-web
#: code:addons/web_m2x_options/static/src/js/form.js:213
#: code:addons/web_m2x_options/static/src/js/form.js:351
#: code:addons/web_m2x_options/static/src/js/form.js:237
#: code:addons/web_m2x_options/static/src/js/form.js:392
#, python-format
msgid "Create and Edit..."
msgstr "Crea e Modifica..."
#. module: web_m2x_options
#. openerp-web
#: code:addons/web_m2x_options/static/src/js/form.js:156
#: code:addons/web_m2x_options/static/src/js/form.js:305
#: code:addons/web_m2x_options/static/src/js/form.js:188
#: code:addons/web_m2x_options/static/src/js/form.js:349
#, python-format
msgid "Search More..."
msgstr "Cerca altro..."

12
web_m2x_options/i18n/pt_BR.po
View File

@ -20,24 +20,24 @@ msgstr ""
#. module: web_m2x_options
#. openerp-web
#: code:addons/web_m2x_options/static/src/js/form.js:191
#: code:addons/web_m2x_options/static/src/js/form.js:330
#: code:addons/web_m2x_options/static/src/js/form.js:219
#: code:addons/web_m2x_options/static/src/js/form.js:373
#, python-format
msgid "Create \"<strong>%s</strong>\""
msgstr "Criar \"<strong>%s</strong>\""
#. module: web_m2x_options
#. openerp-web
#: code:addons/web_m2x_options/static/src/js/form.js:213
#: code:addons/web_m2x_options/static/src/js/form.js:351
#: code:addons/web_m2x_options/static/src/js/form.js:237
#: code:addons/web_m2x_options/static/src/js/form.js:392
#, python-format
msgid "Create and Edit..."
msgstr "Criar e editar.."
#. module: web_m2x_options
#. openerp-web
#: code:addons/web_m2x_options/static/src/js/form.js:156
#: code:addons/web_m2x_options/static/src/js/form.js:305
#: code:addons/web_m2x_options/static/src/js/form.js:188
#: code:addons/web_m2x_options/static/src/js/form.js:349
#, python-format
msgid "Search More..."
msgstr "Buscar mais..."

12
web_m2x_options/i18n/sl.po
View File

@ -20,24 +20,24 @@ msgstr ""
#. module: web_m2x_options
#. openerp-web
#: code:addons/web_m2x_options/static/src/js/form.js:191
#: code:addons/web_m2x_options/static/src/js/form.js:330
#: code:addons/web_m2x_options/static/src/js/form.js:219
#: code:addons/web_m2x_options/static/src/js/form.js:373
#, python-format
msgid "Create \"<strong>%s</strong>\""
msgstr "Ustvari \"<strong>%s</strong>\""
#. module: web_m2x_options
#. openerp-web
#: code:addons/web_m2x_options/static/src/js/form.js:213
#: code:addons/web_m2x_options/static/src/js/form.js:351
#: code:addons/web_m2x_options/static/src/js/form.js:237
#: code:addons/web_m2x_options/static/src/js/form.js:392
#, python-format
msgid "Create and Edit..."
msgstr "Ustvari in urejaj..."
#. module: web_m2x_options
#. openerp-web
#: code:addons/web_m2x_options/static/src/js/form.js:156
#: code:addons/web_m2x_options/static/src/js/form.js:305
#: code:addons/web_m2x_options/static/src/js/form.js:188
#: code:addons/web_m2x_options/static/src/js/form.js:349
#, python-format
msgid "Search More..."
msgstr "Poišči več..."

12
web_m2x_options/i18n/tr.po
View File

@ -21,24 +21,24 @@ msgstr ""
#. module: web_m2x_options
#. openerp-web
#: code:addons/web_m2x_options/static/src/js/form.js:191
#: code:addons/web_m2x_options/static/src/js/form.js:330
#: code:addons/web_m2x_options/static/src/js/form.js:219
#: code:addons/web_m2x_options/static/src/js/form.js:373
#, python-format
msgid "Create \"<strong>%s</strong>\""
msgstr "Oluştur \"<strong>%s</strong>\""
#. module: web_m2x_options
#. openerp-web
#: code:addons/web_m2x_options/static/src/js/form.js:213
#: code:addons/web_m2x_options/static/src/js/form.js:351
#: code:addons/web_m2x_options/static/src/js/form.js:237
#: code:addons/web_m2x_options/static/src/js/form.js:392
#, python-format
msgid "Create and Edit..."
msgstr "Oluştur ve düzenle..."
#. module: web_m2x_options
#. openerp-web
#: code:addons/web_m2x_options/static/src/js/form.js:156
#: code:addons/web_m2x_options/static/src/js/form.js:305
#: code:addons/web_m2x_options/static/src/js/form.js:188
#: code:addons/web_m2x_options/static/src/js/form.js:349
#, python-format
msgid "Search More..."
msgstr "Daha Fazla..."

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

@ -1,12 +1,17 @@
/*global openerp, _, $ */
openerp.web_m2x_options = function (instance) {
/* Copyright 2016 0k.io,ACSONE SA/NV
* * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */
odoo.define('web_m2x_options.web_m2x_options', function (require) {
"use strict";
var QWeb = instance.web.qweb,
_t = instance.web._t,
_lt = instance.web._lt;
var $ = require("$");
var core = require('web.core'),
data = require('web.data'),
Dialog = require('web.Dialog'),
Model = require('web.Model'),
form_relational = require('web.form_relational'),
_ = require('_'),
_t = core._t;
var OPTIONS = ['web_m2x_options.create',
'web_m2x_options.create_edit',
@ -14,7 +19,40 @@ openerp.web_m2x_options = function (instance) {
'web_m2x_options.search_more',
'web_m2x_options.m2o_dialog',];
instance.web.form.FieldMany2One = instance.web.form.FieldMany2One.extend({
var M2ODialog = Dialog.extend({
template: "M2ODialog",
init: function(parent) {
this.name = parent.string;
this._super(parent, {
title: _.str.sprintf(_t("Create a %s"), parent.string),
size: 'medium',
buttons: [
{text: _t('Create'), classes: 'btn-primary', click: function() {
if (this.$("input").val() !== ''){
this.getParent()._quick_create(this.$("input").val());
this.close();
} else {
e.preventDefault();
this.$("input").focus();
}
}},
{text: _t('Create and edit'), classes: 'btn-primary', close: true, click: function() {
this.getParent()._search_create_popup("form", undefined, this.getParent()._create_context(this.$("input").val()));
}},
{text: _t('Cancel'), close: true}
]
});
},
start: function() {
var text = _.str.sprintf(_t("You are creating a new %s, are you sure it does not exist yet?"), this.name);
this.$("p").text(text);
this.$("input").val(this.getParent().$input.val());
},
});
form_relational.FieldMany2One.include({
start: function() {
this._super.apply(this, arguments);
@ -26,7 +64,7 @@ openerp.web_m2x_options = function (instance) {
if (!_.isUndefined(this.view) && _.isUndefined(this.view.ir_options_loaded)) {
this.view.ir_options_loaded = $.Deferred();
this.view.ir_options = {};
(new instance.web.Model("ir.config_parameter"))
(new Model("ir.config_parameter"))
.query(["key", "value"]).filter([['key', 'in', OPTIONS]])
.all().then(function(records) {
_(records).each(function(record) {
@ -57,12 +95,12 @@ openerp.web_m2x_options = function (instance) {
if(this.is_option_set(this.options.m2o_dialog) ||
_.isUndefined(this.options.m2o_dialog) && this.is_option_set(this.view.ir_options['web_m2x_options.m2o_dialog']) ||
this.can_create && _.isUndefined(this.options.m2o_dialog) && _.isUndefined(this.view.ir_options['web_m2x_options.m2o_dialog'])) {
new instance.web.form.M2ODialog(this).open();
new M2ODialog(this).open();
}
},
get_search_result: function (search_val) {
var Objects = new instance.web.Model(this.field.relation);
var Objects = new Model(this.field.relation);
var def = $.Deferred();
var self = this;
// add options limit used to change number of selections record
@ -77,30 +115,25 @@ openerp.web_m2x_options = function (instance) {
this.limit = this.options.limit;
}
// add options search_more to force enable or disable search_more button
if (this.is_option_set(this.options.search_more) || _.isUndefined(this.options.search_more) && this.is_option_set(self.view.ir_options['web_m2x_options.search_more'])) {
this.search_more = true
}
// add options field_color and colors to color item(s) depending on field_color value
this.field_color = this.options.field_color
this.colors = this.options.colors
var dataset = new instance.web.DataSet(this, this.field.relation,
var dataset = new data.DataSet(this, this.field.relation,
self.build_context());
var blacklist = this.get_search_blacklist();
this.last_query = search_val;
var search_result = this.orderer.add(dataset.name_search(
search_val,
new instance.web.CompoundDomain(
new data.CompoundDomain(
self.build_domain(), [["id", "not in", blacklist]]),
'ilike', this.limit + 1,
self.build_context()));
var create_rights;
if (!(self.options && (self.options.no_create || self.options.no_create_edit))) {
create_rights = new instance.web.Model(this.field.relation).call(
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(
"check_access_rights", ["create", false]);
}
@ -120,13 +153,11 @@ openerp.web_m2x_options = function (instance) {
});
// Search result value colors
if (self.colors && self.field_color) {
var value_ids = [];
for (var index in values) {
value_ids.push(values[index].id);
}
// RPC request to get field_color from Objects
Objects.query([self.field_color])
.filter([['id', 'in', value_ids]])
@ -136,7 +167,6 @@ openerp.web_m2x_options = function (instance) {
if (values[index_value].id == objects[index].id) {
// Find value in values by comparing ids
var value = values[index_value];
// Find color with field value as key
var color = self.colors[objects[index][self.field_color]] || 'black';
value.label = '<span style="color:'+color+'">'+value.label+'</span>';
@ -149,8 +179,11 @@ openerp.web_m2x_options = function (instance) {
}
// search more... if more results that max
var can_search_more = (self.options && self.is_option_set(self.options.search_more)),
search_more_undef = _.isUndefined(self.options.search_more) && _.isUndefined(self.view.ir_options['web_m2x_options.search_more']),
search_more = self.is_option_set(self.view.ir_options['web_m2x_options.search_more']);
if (values.length > self.limit || self.search_more) {
if (values.length > self.limit && (can_search_more || search_more_undef || search_more)) {
values = values.slice(0, self.limit);
values.push({
label: _t("Search More..."),
@ -164,7 +197,7 @@ openerp.web_m2x_options = function (instance) {
self._search_create_popup("search", data);
});
},
classname: 'oe_m2o_dropdown_option'
classname: 'oe_m2o_dropdown_option o_m2o_dropdown_option'
});
}
@ -173,16 +206,12 @@ openerp.web_m2x_options = function (instance) {
var raw_result = _(data.result).map(function (x) {
return x[1];
});
var no_quick_create = (
self.options && (self.options.no_create ||
self.options.no_quick_create)
)
var m2x_create_undef = _.isUndefined(self.view.ir_options['web_m2x_options.create'])
var m2x_create = self.view.ir_options['web_m2x_options.create'] == "True"
if (!no_quick_create && ((m2x_create_undef && can_create) ||
m2x_create)) {
var quick_create = self.is_option_set(self.options.create) || self.is_option_set(self.options.quick_create),
quick_create_undef = _.isUndefined(self.options.create) && _.isUndefined(self.options.quick_create),
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 (search_val.length > 0 &&
!_.include(raw_result, search_val)) {
@ -193,22 +222,18 @@ openerp.web_m2x_options = function (instance) {
action: function () {
self._quick_create(search_val);
},
classname: 'oe_m2o_dropdown_option'
classname: 'oe_m2o_dropdown_option o_m2o_dropdown_option'
});
}
}
// create...
var no_create_edit = (
self.options && (self.options.no_create ||
self.options.no_create_edit)
)
var m2x_create_edit_undef = _.isUndefined(self.view.ir_options['web_m2x_options.create_edit'])
var m2x_create_edit = self.view.ir_options['web_m2x_options.create_edit'] == "True"
if (!no_create_edit && ((m2x_create_edit_undef && can_create) ||
m2x_create_edit)) {
var create_edit = self.is_option_set(self.options.create) || self.is_option_set(self.options.create_edit),
create_edit_undef = _.isUndefined(self.options.create) && _.isUndefined(self.options.create_edit),
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){
values.push({
label: _t("Create and Edit..."),
action: function () {
@ -216,10 +241,9 @@ openerp.web_m2x_options = function (instance) {
"form", undefined,
self._create_context(search_val));
},
classname: 'oe_m2o_dropdown_option'
classname: 'oe_m2o_dropdown_option o_m2o_dropdown_option'
});
}
// Check if colors specified to wait for RPC
if (!(self.field_color && self.colors)){
def.resolve(values);
@ -230,12 +254,19 @@ openerp.web_m2x_options = function (instance) {
}
});
instance.web.form.FieldMany2ManyTags.include({
form_relational.FieldMany2ManyTags.include({
events: {
'click .o_delete': function(e) {
this.remove_id($(e.target).parent().data('id'));
},
'click .badge': 'open_badge',
'mousedown .o_colorpicker span': 'update_color',
'focusout .o_colorpicker': 'close_color_picker',
},
show_error_displayer: function () {
if ((typeof this.options.m2o_dialog === 'undefined' && this.can_create) ||
this.options.m2o_dialog) {
new instance.web.form.M2ODialog(this).open();
new M2ODialog(this).open();
}
},
@ -249,7 +280,7 @@ openerp.web_m2x_options = function (instance) {
if (_.isUndefined(this.view.ir_options_loaded)) {
this.view.ir_options_loaded = $.Deferred();
this.view.ir_options = {};
(new instance.web.Model("ir.config_parameter"))
(new Model("ir.config_parameter"))
.query(["key", "value"]).filter([['key', 'in', OPTIONS]])
.all().then(function(records) {
_(records).each(function(record) {
@ -261,6 +292,20 @@ openerp.web_m2x_options = function (instance) {
return this.view.ir_options_loaded;
},
is_option_set: function(option) {
if (_.isUndefined(option)) {
return false
}
var is_string = typeof option === 'string'
var is_bool = typeof option === 'boolean'
if (is_string) {
return option === 'true' || option === 'True'
} else if (is_bool) {
return option
}
return false
},
/**
* Call this method to search using a string.
*/
@ -279,12 +324,12 @@ openerp.web_m2x_options = function (instance) {
this.limit = this.options.limit;
}
var dataset = new instance.web.DataSet(this, this.field.relation, self.build_context());
var dataset = new data.DataSet(this, this.field.relation, self.build_context());
var blacklist = this.get_search_blacklist();
this.last_query = search_val;
return this.orderer.add(dataset.name_search(
search_val, new instance.web.CompoundDomain(self.build_domain(), [["id", "not in", blacklist]]),
search_val, new data.CompoundDomain(self.build_domain(), [["id", "not in", blacklist]]),
'ilike', this.limit + 1, self.build_context())).then(function(data) {
self.last_search = data;
// possible selections for the m2o
@ -304,6 +349,7 @@ openerp.web_m2x_options = function (instance) {
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
@ -311,18 +357,16 @@ openerp.web_m2x_options = function (instance) {
self._search_create_popup("search", data);
});
},
classname: 'oe_m2o_dropdown_option'
classname: 'oe_m2o_dropdown_option o_m2o_dropdown_option'
});
}
// quick create
var no_quick_create = (
self.options && (self.options.no_create ||
self.options.no_quick_create)
)
var m2x_create_undef = _.isUndefined(self.view.ir_options['web_m2x_options.create'])
var m2x_create = self.view.ir_options['web_m2x_options.create'] == "True"
if (!no_quick_create && (m2x_create_undef || m2x_create)) {
var quick_create = self.is_option_set(self.options.create) || self.is_option_set(self.options.quick_create),
quick_create_undef = _.isUndefined(self.options.create) && _.isUndefined(self.options.quick_create),
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){
var raw_result = _(data.result).map(function(x) {return x[1];});
if (search_val.length > 0 && !_.include(raw_result, search_val)) {
@ -332,27 +376,25 @@ openerp.web_m2x_options = function (instance) {
action: function() {
self._quick_create(search_val);
},
classname: 'oe_m2o_dropdown_option'
classname: 'oe_m2o_dropdown_option o_m2o_dropdown_option'
});
}
}
// create...
var no_create_edit = (
self.options && (self.options.no_create ||
self.options.no_create_edit)
)
var m2x_create_edit_undef = _.isUndefined(self.view.ir_options['web_m2x_options.create_edit'])
var m2x_create_edit = self.view.ir_options['web_m2x_options.create_edit'] == "True"
if (!no_create_edit && (m2x_create_edit_undef || m2x_create_edit)) {
var create_edit = self.is_option_set(self.options.create) || self.is_option_set(self.options.create_edit),
create_edit_undef = _.isUndefined(self.options.create) && _.isUndefined(self.options.create_edit),
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){
values.push({
label: _t("Create and Edit..."),
action: function() {
self._search_create_popup("form", undefined, self._create_context(search_val));
},
classname: 'oe_m2o_dropdown_option'
classname: 'oe_m2o_dropdown_option o_m2o_dropdown_option'
});
}
@ -360,29 +402,24 @@ openerp.web_m2x_options = function (instance) {
})
},
render_value: function()
{
open_badge: function(ev){
var self = this;
return jQuery.when(this._super.apply(this, arguments))
.then(function()
{
if(self.options.open)
{
self.$el.find('.oe_tag')
.css('cursor', 'pointer')
.click(function(e)
{
var id = parseInt(jQuery(this).attr('data-id'));
self.do_action({
type: 'ir.actions.act_window',
res_model: self.field.relation,
views: [[false, 'form']],
res_id: id,
});
var open = (self.options && self.is_option_set(self.options.open));
if(open){
self.mutex.exec(function(){
var id = parseInt($(ev.handleObj.selector).attr('data-id'));
self.do_action({
type: 'ir.actions.act_window',
res_model: self.field.relation,
views: [[false, 'form']],
res_id: id,
target: "new"
});
}
});
}.bind(this));
}else{
self.open_color_picker(ev);
}
},
});
};
});
});

2
web_m2x_options/static/src/xml/base.xml
View File

@ -6,7 +6,7 @@
</t>
</t>
<t t-extend="FieldMany2ManyTag">
<t t-jquery="span.oe_tag">
<t t-jquery="span.badge">
jQuery(this).attr('t-att-data-id', 'el[0]');
</t>
</t>