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

[IMP] mail: indented DOM class 

bzr revid: chm@openerp.com-20121022144834-qqnk9etnfuyr25fr
This commit is contained in:
Christophe Matthieu 2012-10-22 16:48:34 +02:00
parent 40e0c47118
commit fb1a008857
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -769,7 +769,7 @@ openerp.mail = function(session) {
// if this message is read, all childs message display is read // if this message is read, all childs message display is read
this.ds_notification.call('set_message_read', [ [this.id].concat( this.get_child_ids() ) , this.to_read, this.context]).pipe(function(){ this.ds_notification.call('set_message_read', [ [this.id].concat( this.get_child_ids() ) , this.to_read, this.context]).pipe(function(){
self.$el.removeClass(this.to_read ? 'oe_msg_unread':'oe_msg_read').addClass(self.to_read ? 'oe_msg_read':'oe_msg_unread'); self.$el.removeClass(self.to_read ? 'oe_msg_unread':'oe_msg_read').addClass(self.to_read ? 'oe_msg_read':'oe_msg_unread');
self.to_read = !self.to_read; self.to_read = !self.to_read;
}); });
return false; return false;
@ -934,7 +934,7 @@ openerp.mail = function(session) {
this.thread_level = (datasets.thread_level+1) || 0, this.thread_level = (datasets.thread_level+1) || 0,
this.partner_ids = _.filter(datasets.partner_ids, function(partner){ return partner[0]!=datasets.author_id[0]; } ) this.partner_ids = _.filter(datasets.partner_ids, function(partner){ return partner[0]!=datasets.author_id[0]; } )
this.messages = []; this.messages = [];
this.show_compose_message = this.options.show_compose_message && this.options.show_reply_button > this.thread_level; this.show_compose_message = this.options.show_compose_message && (this.options.show_reply_button > this.thread_level || !this.thread_level);
// object compose message // object compose message
this.ComposeMessage = false; this.ComposeMessage = false;
@ -1464,7 +1464,7 @@ openerp.mail = function(session) {
this.thread.no_message(); this.thread.no_message();
this.thread.message_fetch(); this.thread.message_fetch();
if(this.options.show_compose_message){ if(this.options.show_compose_message && this.thread.ComposeMessage){
this.thread.ComposeMessage.do_show_compact(); this.thread.ComposeMessage.do_show_compact();
} }
}, },
@ -1535,7 +1535,7 @@ openerp.mail = function(session) {
'context' : this.options.context, 'context' : this.options.context,
'typeof_thread': this.options.context['typeof_thread'] || 'other', 'typeof_thread': this.options.context['typeof_thread'] || 'other',
'display_indented_thread': -1, 'display_indented_thread': -1,
'show_reply_button': 10, 'show_reply_button': 0,
'show_read_unread_button': -1, 'show_read_unread_button': -1,
'show_compose_message': show_compose_message 'show_compose_message': show_compose_message
} }

2
addons/mail/static/src/xml/mail.xml
View File

@ -184,7 +184,7 @@
<!-- default layout --> <!-- default layout -->
<t t-name="mail.thread.message"> <t t-name="mail.thread.message">
<div t-attf-class="oe_msg oe_lvl_#{widget.thread_level} oe_msg_#{widget.type} oe_msg_#{widget.to_read?'unread':'read'}"> <div t-attf-class="oe_msg #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''} oe_msg_#{widget.type} oe_msg_#{widget.to_read?'unread':'read'}">
<div class='oe_msg_left'> <div class='oe_msg_left'>
<a t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}" t-att-title="widget.author_id[1]"> <a t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}" t-att-title="widget.author_id[1]">