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

[FIX] mail: fixed merge issue, forgottent conflict 

bzr revid: tde@openerp.com-20130717085925-l0u2nkvz91wm5kcy
This commit is contained in:
Thibault Delavallée 2013-07-17 10:59:25 +02:00
parent 32d0f6bce0
commit 48dd55b1e8
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -967,10 +967,8 @@ openerp.mail = function (session) {
this.$('.oe_reply').on('click', this.on_message_reply);
this.$('.oe_star').on('click', this.on_star);
this.$('.oe_msg_vote').on('click', this.on_vote);
<<<<<<< TREE
this.$('.oe_mail_expand').on('click', this.on_expand);
this.$('.oe_mail_reduce').on('click', this.on_expand);
=======
this.$('.oe_mail_action_model').on('click', this.on_record_clicked);
},
@ -989,7 +987,6 @@ openerp.mail = function (session) {
views: [[false, 'form']]
});
return false;
>>>>>>> MERGE-SOURCE
},
/* Call the on_compose_message on the thread of this message. */