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

[FIX] Wall: fixed search not taken into account in the domain given to the displayed threads. 

bzr revid: tde@openerp.com-20120911132122-9w5d1jdk0br5khqs
This commit is contained in:
Thibault Delavallée 2012-09-11 15:21:22 +02:00
parent 13da3d028f
commit b82a3a2223
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
addons/mail/static/src/js/mail.js
View File

@ -684,11 +684,8 @@ openerp.mail = function(session) {
this.options.domain = options.domain || [];
this.options.context = options.context || {};
this.options.thread_level = options.thread_level || 1;
this.thread_list = [];
this.ds_msg = new session.web.DataSetSearch(this, 'mail.message');
// for search view
this.search = {'domain': [], 'context': {}, 'groupby': {}}
this.search_results = {'domain': [], 'context': {}, 'groupby': {}}
this.ds_msg = new session.web.DataSetSearch(this, 'mail.message');
},
start: function () {
@ -699,7 +696,7 @@ openerp.mail = function(session) {
},
destroy: function () {
for (var i in this.thread_list) { this.thread_list[i].destroy(); }
if (this.thread) this.thread.destroy();
this._super.apply(this, arguments);
},
@ -746,10 +743,11 @@ openerp.mail = function(session) {
/** Display the Wall threads */
message_display: function () {
var thread_domain = this.options.domain.concat(this.search_results['domain']);
var render_res = session.web.qweb.render('mail.wall_thread_container', {});
$('<li class="oe_mail_wall_thread">').html(render_res).appendTo(this.$el.find('ul.oe_mail_wall_threads'));
var thread = new mail.Thread(this, {
'domain': this.options.domain, 'context': this.options.context,
'domain': thread_domain, 'context': this.options.context,
'thread_level': this.options.thread_level, 'composer': true,
// display options
'show_header_compose': true, 'show_reply': this.options.thread_level > 0,
@ -757,7 +755,7 @@ openerp.mail = function(session) {
}
);
thread.appendTo(this.$el.find('li.oe_mail_wall_thread:last'));
this.thread_list.push(thread);
this.thread = thread;
},
});
};