odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Open popup with selected ids for more. 

bzr revid: nicolas.vanhoren@openerp.com-20110516110242-yxhdxhabobuid83u
This commit is contained in:
niv-openerp 2011-05-16 16:32:42 +05:30
parent 28290faf6d
commit f39eea6a79
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/base/static/src/js/form.js
View File

@ -1086,8 +1086,9 @@ openerp.base.form.Many2ManyListView = openerp.base.ListView.extend({
openerp.base.form.Many2XSelectPopup = openerp.base.BaseWidget.extend({
identifier_prefix: "many2xselectpopup",
template: "Many2XSelectPopup",
select_element: function(model) {
select_element: function(model, dataset) {
this.model = model;
this.dataset = dataset
var html = this.render();
jQuery(html).dialog({title: '',
modal: true,
@ -1096,7 +1097,9 @@ openerp.base.form.Many2XSelectPopup = openerp.base.BaseWidget.extend({
},
start: function() {
this._super();
this.dataset = new openerp.base.DataSetSearch(this.session, this.model);
if (!this.dataset) {
this.dataset = new openerp.base.DataSetSearch(this.session, this.model);
}
this.setup_search_view();
},
setup_search_view: function() {

2
addons/base/static/src/js/m2o.js
View File

@ -55,7 +55,7 @@ openerp.base.m2o = function(openerp){
if (ui.item.id == 'more') {
self.dataset.ids = self.result_ids;
self.dataset.count = self.dataset.ids.length;
self.dataset.domain = [];
self.dataset.domain = self.result_ids.length ? [["id", "in", self.dataset.ids]] : []
self.element.val('');
var pop = new openerp.base.form.Many2XSelectPopup(null, self.session);
pop.select_element(self.relation, self.dataset);