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

[IMP] Chatter: improved footer of chatter messages: better differentiation of logged a note / send a message / system notification, with or without recipients. 

bzr revid: tde@openerp.com-20130403145151-nvpeqdpp937079iu
This commit is contained in:
Thibault Delavallée 2013-04-03 16:51:51 +02:00
parent 828edbb276
commit 35b51a2efd
4 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/mail/mail_message.py
View File

@ -366,6 +366,7 @@ class mail_message(osv.Model):
return {'id': message.id,
'type': message.type,
'subtype': message.subtype_id.name if message.subtype_id else False,
'body': body_html,
'model': message.model,
'res_id': message.res_id,

3
addons/mail/static/src/css/mail.css
View File

@ -57,6 +57,9 @@
.openerp .oe_mail .oe_msg.oe_msg_nobody{
background: #F8F8F8;
}
.openerp .oe_mail .oe_msg.oe_msg_notification{
background: #F8F8F8;
}
.openerp .oe_mail .oe_msg .oe_msg_left{
position: absolute;
left:0; top: 0; bottom: 0; width: 40px;

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

@ -217,6 +217,7 @@ openerp.mail = function (session) {
this.res_id = datasets.res_id || this.context.default_res_id || false,
this.parent_id = datasets.parent_id || false,
this.type = datasets.type || false,
this.subtype = datasets.subtype || false,
this.is_author = datasets.is_author || false,
this.is_private = datasets.is_private || false,
this.subject = datasets.subject || false,

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

@ -226,7 +226,7 @@
<!-- default layout -->
<t t-name="mail.thread.message">
<div t-attf-class="oe_msg #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''} #{widget.partner_ids.length == 0 ? 'oe_msg_nobody' : ''} oe_msg_#{widget.type}">
<div t-attf-class="oe_msg #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''} #{widget.subtype ? '' : 'oe_msg_nobody'} oe_msg_#{widget.type}">
<div class='oe_msg_left'>
<a t-if="widget.options.show_link" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}" t-att-title="widget.author_id[1]">
@ -263,13 +263,23 @@
</t>
<a t-if="widget.author_id and widget.options.show_link and widget.author_id[0]" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[2]"/></a>
<span t-if="widget.author_id and (!widget.options.show_link or !widget.author_id[0])"><t t-raw="widget.author_id[2]"/></span>
<t t-if="widget.partner_ids.length == 0">
<t t-if="widget.type == 'notification'">
updated document
<t t-if="widget.partner_ids.length > 0">
<span class='oe_subtle'>•</span>
</t>
</t>
<t t-if="widget.type == 'comment' and ! widget.subtype">
logged a note
</t>
<t t-if="widget.partner_ids.length > 0">
<t t-if="(widget.type == 'comment' or widget.type == 'email') and widget.subtype">
to
<t t-if="widget.partner_ids.length == 0">
nobody
</t>
</t>
<t t-foreach="widget.partner_ids.slice(0, 3)" t-as="partner">
<t t-if="widget.type == 'notification' or ( (widget.type == 'email' or widget.type == 'comment') and widget.subtype)"
t-foreach="widget.partner_ids.slice(0, 3)" t-as="partner">
<span t-attf-class="oe_partner_follower">
<a t-if="widget.options.show_link" t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a>
<t t-if="!widget.options.show_link" t-raw="partner[1]"/>
@ -279,6 +289,9 @@
<t t-if="widget.partner_ids.length > 3">
<span t-att-title="widget.extra_partners_str">and <t t-raw="widget.extra_partners_nbr"/> more</span>
</t>
<t t-if="widget.type == 'notification' and widget.partner_ids.length > 0">
notified
</t>
<span class='oe_subtle'>•</span>
<span t-att-title="widget.date"><t t-if="widget.timerelative" t-raw="widget.timerelative"/><t t-if="!widget.timerelative" t-raw="widget.date"/></span>
<span t-if="!widget.options.readonly" class='oe_subtle'>•</span>