summaryrefslogtreecommitdiff
path: root/addons/base/static/src
diff options
context:
space:
mode:
authorsma (Tiny) <sma@tinyerp.com>2011-05-02 18:55:12 +0530
committersma (Tiny) <sma@tinyerp.com>2011-05-02 18:55:12 +0530
commit9be03eaf9e9529db291b0b196a5c7fa1f7affcf1 (patch)
treef91a767d7737d8b37b1e1cc8748d553cac1c9e52 /addons/base/static/src
parent5b5edbe9b9d275074cc8ea4731c719155478fdbd (diff)
[FIX] Open records with selected ids for m2o popup.
bzr revid: sma@tinyerp.com-20110502132512-r9x0zts9wu21xrem
Diffstat (limited to 'addons/base/static/src')
-rw-r--r--addons/base/static/src/js/list.js3
-rw-r--r--addons/base/static/src/js/m2o.js7
2 files changed, 5 insertions, 5 deletions
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index aa9882aed36..728ec19bc6f 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -316,7 +316,8 @@ openerp.base.ListView = openerp.base.Controller.extend(
'model': this.dataset.model,
'id': this.view_id,
'context': this.dataset.context,
- 'domain': this.dataset.domain
+ 'domain': this.dataset.domain,
+ 'ids': this.dataset.ids
}, this.do_fill_table);
},
/**
diff --git a/addons/base/static/src/js/m2o.js b/addons/base/static/src/js/m2o.js
index 8cdf313667e..705c9abb529 100644
--- a/addons/base/static/src/js/m2o.js
+++ b/addons/base/static/src/js/m2o.js
@@ -9,7 +9,6 @@ openerp.base.m2o = openerp.base.Controller.extend({
this.relation = model;
this.dataset = dataset;
this.name = this.element.attr('name');
-
this.selectedResultRow = 0;
this.selectedResult = false;
this.numResultRows = 0;
@@ -17,7 +16,6 @@ openerp.base.m2o = openerp.base.Controller.extend({
this.specialKeyPressed = false;
this.lastKey = null;
this.delayedRequest = null;
-
this.lastTextResult = this.element.val();
this.lastSearch = null;
@@ -181,8 +179,8 @@ openerp.base.m2o = openerp.base.Controller.extend({
case 13:
case 1:
var $selectedRow = jQuery("#autoComplete" + this.name + "_" + this.selectedResultRow);
- this.dataset.ids = _.without.apply(null, [this.dataset.ids].concat(this.result_ids));
-
+ this.dataset.ids = this.result_ids;
+ this.dataset.domain = [];
this.dataset.count = this.dataset.ids.length;
if ($selectedRow.find('td').attr('id') == 'more') {
var element_id = _.uniqueId("act_window_dialog");
@@ -199,6 +197,7 @@ openerp.base.m2o = openerp.base.Controller.extend({
});
var event_list = new openerp.base.ListView(this.view_manager, this.session, element_id, this.dataset, false);
event_list.start();
+ event_list.do_reload();
}
this.setCompletionText($selectedRow, true);
this.clearResults();