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

[IMP] Thread widget: small tweaks (reply link now not shown anymore on record threaded view; post comment textarea now not shown anymoreon record threaded view; oe_mail_oe_right css class => oe_righit) 

bzr revid: tde@openerp.com-20120515122306-0vf3sys8rov9znxk
This commit is contained in:
Thibault Delavallée 2012-05-15 14:23:06 +02:00
parent 2a42c7bf67
commit 12d8dceaa9
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/mail/mail_group_view.xml
View File

@ -62,7 +62,7 @@
<field name="responsible_id" colspan="2"/>
<label string="Visible by non members" colspan="1"/>
<field name="public" nolabel="1"/>
<field name="push_to_groups" colspan="2"/>
<field name="push_to_groups" colspan="2" attrs="{'invisible':[('groups','=',False)]}"/>
</group>
<group colspan="4" col="4">
<field name="description" colspan="4" nolabel="1"/>

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

@ -58,7 +58,7 @@ openerp.mail = function(session) {
this.display = {};
this.display.show_post_comment = this.params.show_post_comment || false;
this.display.show_msg_menu = this.params.is_wall;
this.display.show_reply = (this.params.thread_level > 0);
this.display.show_reply = (this.params.thread_level > 0 && this.params.is_wall);
this.display.show_delete = ! this.params.is_wall;
this.display.show_hide = this.params.is_wall;
this.display.show_reply_by_email = ! this.params.is_wall;
@ -81,7 +81,7 @@ openerp.mail = function(session) {
},
do_customize_display: function() {
if (this.display.show_post_comment) { this.$element.find('div.oe_mail_thread_act').show(); }
if (this.display.show_post_comment) { this.$element.find('div.oe_mail_thread_act').eq(0).show(); }
if (this.display.show_reply_by_email) { this.$element.find('a.oe_mail_compose').show(); }
if (! this.display.show_msg_menu) { this.$element.find('img.oe_mail_msg_menu_icon').hide(); }
},
@ -250,7 +250,8 @@ openerp.mail = function(session) {
});
self.display_comment(record);
self.thread = new mail.Thread(self, {'res_model': self.params.res_model, 'res_id': self.params.res_id, 'uid': self.params.uid,
'records': sub_msgs, 'thread_level': (self.params.thread_level-1), 'parent_id': record.id});
'records': sub_msgs, 'thread_level': (self.params.thread_level-1), 'parent_id': record.id,
'is_wall': self.params.is_wall});
self.$element.find('li.oe_mail_thread_msg:last').append('<div class="oe_mail_thread_subthread"/>');
self.thread.appendTo(self.$element.find('div.oe_mail_thread_subthread:last'));
}
@ -658,7 +659,7 @@ openerp.mail = function(session) {
$('<div class="oe_mail_wall_thread">').html(render_res).appendTo(self.$element.find('div.oe_mail_wall_threads'));
var thread = new mail.Thread(self, {
'res_model': model_name, 'res_id': res_id, 'uid': self.session.uid, 'records': records,
'parent_id': false, 'thread_level': self.params.thread_level, 'show_hide': true}
'parent_id': false, 'thread_level': self.params.thread_level, 'show_hide': true, 'is_wall': true}
);
self.thread_list.push(thread);
return thread.appendTo(self.$element.find('div.oe_mail_wall_thread:last'));

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

@ -50,7 +50,7 @@
<div class="oe_mail_msg_content">
<textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/><br />
</div>
<a href="#" class="oe_mail_compose oe_mail_oe_right">Send an e-mail
<a href="#" class="oe_mail_compose oe_right">Send an e-mail
<img src='/mail/static/src/img/email_icon.png' alt='Send an e-mail'/>
</a>
</div>
@ -91,7 +91,7 @@
<a href="#" class="intlink oe_mail_oe_intlink" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
on <t t-raw="record.date"/>
</span>
<span class="oe_mail_oe_right">
<span class="oe_right">
<t t-call="MessageDisplayManageLinks"/>
</span>
</p>
@ -108,7 +108,7 @@
</p>
<p class="oe_mail_msg">
<span class="oe_mail_msg_body"><t t-raw="record.body"/></span><br />
<span class="oe_mail_oe_right">
<span class="oe_right">
<t t-call="MessageDisplayManageLinks"/>
</span>
</p>