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

[fix] mail: show more message always on flat mode 

bzr revid: chm@openerp.com-20130320154643-nizd22s9ojzd363j
This commit is contained in:
Christophe Matthieu 2013-03-20 16:46:43 +01:00
parent 770b0cb380
commit 64046e182e
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -915,9 +915,9 @@ openerp.mail = function (session) {
// read messages
self.parent_thread.message_fetch(this.domain, this.context, false, function (arg, data) {
if (self.options.root_thread == self.parent_thread) {
data.reverse();
}
// if (self.options.root_thread == self.parent_thread) {
// data.reverse();
// }
self.id = false;
// insert the message on dom after this message
self.parent_thread.switch_new_message( data, self.$el );
@ -1217,7 +1217,7 @@ openerp.mail = function (session) {
this.partner_ids = datasets.partner_ids;
this.messages = [];
this.options.flat_mode = !!(this.options.display_indented_thread > this.thread_level ? this.options.display_indented_thread - this.thread_level : 0);
this.options.flat_mode = (this.options.display_indented_thread - this.thread_level > 0);
// object compose message
this.compose_message = false;
@ -1439,8 +1439,8 @@ openerp.mail = function (session) {
create_message_object: function (data) {
var self = this;
var data = _.extend(data, {'thread_level': data.thread_level ? data.thread_level : self.thread_level});
data.options = _.extend(self.options, data.options);
data.thread_level = self.thread_level || 0;
data.options = _.extend(data.options || {}, self.options);
if (data.type=='expandable') {
var message = new mail.ThreadExpandable(self, data, {'context':{
@ -1485,8 +1485,7 @@ openerp.mail = function (session) {
}
this.$('.oe_view_nocontent').remove();
if (dom_insert_after) {
if (dom_insert_after && dom_insert_after.parent()[0] == self.$el[0]) {
message.insertAfter(dom_insert_after);
} else if (prepend) {
message.prependTo(self.$el);
@ -1505,6 +1504,7 @@ openerp.mail = function (session) {
*/
switch_new_message: function (records, dom_insert_after) {
var self=this;
var dom_insert_after = typeof dom_insert_after == 'object' ? dom_insert_after : false;
_(records).each(function (record) {
var thread = self.browse_thread({
'id': record.parent_id,
@ -1513,7 +1513,7 @@ openerp.mail = function (session) {
// create object and attach to the thread object
var message = thread.create_message_object( record );
// insert the message on dom
thread.insert_message( message, typeof dom_insert_after == 'object' ? dom_insert_after : false);
thread.insert_message( message, dom_insert_after);
});
if (!records.length && this.options.root_thread == this) {
this.no_message();