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

[IMP] Chatter: full wizard composer does not display recipients in 'log' mode. 

bzr revid: tde@openerp.com-20130226125038-bgpmfrmt3v44i870
This commit is contained in:
Thibault Delavallée 2013-02-26 13:50:38 +01:00
parent c5e395ec49
commit d2e1ff39cc
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,7 +235,7 @@
word-spacing: 3px;
cursor: text;
}
.openerp .oe_mail .oe_msg.oe_msg_composer_compact .oe_compact_record{
.openerp .oe_mail .oe_msg.oe_msg_composer_compact .oe_compact_record {
font-size: 13px;
font-style: bold;
text-align: center;

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

@ -545,6 +545,9 @@ openerp.mail = function (session) {
'default_attachment_ids': self.attachment_ids,
'default_partner_ids': partner_ids,
};
if (self.is_log) {
_.extend(context, {'mail_compose_log': true});
}
if (default_composition_mode != 'reply' && self.context.default_model && self.context.default_res_id) {
context.default_model = self.context.default_model;
context.default_res_id = self.context.default_res_id;

6
addons/mail/wizard/mail_compose_message.py
View File

@ -191,6 +191,7 @@ class mail_compose_message(osv.TransientModel):
if context is None:
context = {}
active_ids = context.get('active_ids')
is_log = context.get('mail_compose_log', False)
for wizard in self.browse(cr, uid, ids, context=context):
mass_mail_mode = wizard.composition_mode == 'mass_mail'
@ -216,7 +217,10 @@ class mail_compose_message(osv.TransientModel):
post_values['attachments'] += new_attachments
post_values.update(email_dict)
# post the message
active_model_pool.message_post(cr, uid, [res_id], type='comment', subtype='mt_comment', context=context, **post_values)
subtype = 'mail.mt_comment'
if is_log:
subtype = False
active_model_pool.message_post(cr, uid, [res_id], type='comment', subtype=subtype, context=context, **post_values)
return {'type': 'ir.actions.act_window_close'}

5
addons/mail/wizard/mail_compose_message_view.xml
View File

@ -13,8 +13,9 @@
<field name="res_id" invisible="1"/>
<field name="parent_id" invisible="1"/>
<!-- visible wizard -->
<label for="partner_ids" string="Recipients"/>
<div groups="base.group_user">
<label for="partner_ids" string="Recipients"
invisible="context.get('mail_compose_log', False)"/>
<div groups="base.group_user" invisible="context.get('mail_compose_log', False)">
<span attrs="{'invisible':['|', ('model', '=', False), ('composition_mode', '!=', 'mass_mail')]}">
Followers of selected items and
</span>