Browse Source

Merge pull request #323 from OCA/revert-322-revert-312-9.0-widget-many2many-multi-selection

Revert "Revert "[MIG]Migrated web widget many2many_tags multi selection in v9""
pull/336/head
Pedro M. Baeza 9 years ago
parent
commit
f3dd839d11
  1. 1
      web_widget_many2many_tags_multi_selection/README.rst
  2. 6
      web_widget_many2many_tags_multi_selection/__openerp__.py
  3. 55
      web_widget_many2many_tags_multi_selection/static/src/js/view_form.js

1
web_widget_many2many_tags_multi_selection/README.rst

@ -29,6 +29,7 @@ Contributors
------------
* Sylvain Calador <sylvain.calador@akretion.com>
* Jamin Shah <jaiminshah2009@gmail.com>
Maintainer
----------

6
web_widget_many2many_tags_multi_selection/__openerp__.py

@ -21,8 +21,8 @@
{
'name': 'Tags multiple selection',
'version': '8.0.0.1.0',
'author': 'Akretion, Odoo Community Association (OCA)',
'version': '9.0.1.1.0',
'author': 'Akretion, Odoo Community Association (OCA), Jamin Shah',
'depends': [
'web',
],
@ -31,6 +31,6 @@
'data': [
'views/web_widget_many2many_tags_multi_selection.xml',
],
'installable': False,
'installable': True,
'auto_install': False,
}

55
web_widget_many2many_tags_multi_selection/static/src/js/view_form.js

@ -1,38 +1,39 @@
openerp.web_widget_many2many_tags_multi_selection = function(instance, local) {
odoo.define('web_widget_many2many_tags_multi_selection.multiple_tags', function (require) {
"use strict";
var _t = instance.web._t;
var FormCommon = require('web.form_common');
var core = require('web.core');
var data = require('web.data');
var _t = core._t;
instance.web.form.CompletionFieldMixin._search_create_popup = function(view, ids, context) {
FormCommon.CompletionFieldMixin._search_create_popup = function(view, ids, context) {
var self = this;
var pop = new instance.web.form.SelectCreatePopup(this);
new FormCommon.SelectCreateDialog(this, {
res_model: self.field.relation,
domain: self.build_domain(),
context: new data.CompoundContext(self.build_context(), context || {}),
title: (view === 'search' ? _t("Search: ") : _t("Create: ")) + this.string,
initial_ids: ids ? _.map(ids, function(x) {return x[0];}) : undefined,
initial_view: view,
disable_multiple_selection: this.field.type != 'many2many',
on_selected: function(element_ids) {
for(var i=0, len=element_ids.length; i<len;i++) {
self.add_id(element_ids[i]);
if (self.field.type != 'many2many') {
break;
}
}
self.focus();
}
}).open();
var domain = self.build_domain();
if (self.field.type == 'many2many') {
var selected_ids = self.get_search_blacklist();
if (selected_ids.length > 0) {
domain = new instance.web.CompoundDomain(domain, ["!", ["id", "in", selected_ids]]);
domain = new data.CompoundDomain(domain, ["!", ["id", "in", selected_ids]]);
}
}
pop.select_element(
self.field.relation,
{
title: (view === 'search' ? _t("Search: ") : _t("Create: ")) + this.string,
initial_ids: ids ? _.map(ids, function(x) {return x[0];}) : undefined,
initial_view: view,
disable_multiple_selection: this.field.type != 'many2many',
},
domain,
new instance.web.CompoundContext(self.build_context(), context || {})
);
pop.on("elements_selected", self, function(element_ids) {
for(var i=0, len=element_ids.length; i<len;i++) {
self.add_id(element_ids[i]);
if (self.field.type != 'many2many') {
break;
}
}
self.focus();
});
};
}
}
});
Loading…
Cancel
Save