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

[IMP] mail: add 'Log a note' button right after 'Send to followers' button 

bzr revid: chm@openerp.com-20130214113702-ste98tekdcj4kt4w
This commit is contained in:
Christophe Matthieu 2013-02-14 12:37:02 +01:00
parent ca76cb8d32
commit 6f1f3f8a03
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -439,7 +439,8 @@
line-height: 12px;
vertical-align: middle;
}
.openerp .oe_mail .oe_msg_footer button.oe_post{
.openerp .oe_mail .oe_msg_footer button.oe_post,
.openerp .oe_mail .oe_msg_footer button.oe_log{
position: relative;
z-index: 2;
}

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

@ -495,6 +495,7 @@ openerp.mail = function (session) {
this.$('.oe_cancel').on('click', _.bind( this.on_cancel, this) );
this.$('.oe_post').on('click', _.bind( this.on_message_post, this) );
this.$('.oe_log').on('click', _.bind( this.on_message_log, this) );
this.$('.oe_full').on('click', _.bind( this.on_compose_fullmail, this, this.id ? 'reply' : 'comment') );
/* stack for don't close the compose form if the user click on a button */
this.$('.oe_msg_left, .oe_msg_center').on('mousedown', _.bind( function () { this.stay_open = true; }, this));
@ -632,17 +633,27 @@ openerp.mail = function (session) {
}
},
on_message_log: function (event) {
if (this.do_check_attachment_upload() && (this.attachment_ids.length || this.$('textarea').val().match(/\S+/))) {
this.do_send_message_post([], true);
}
},
/*do post a message and fetch the message*/
do_send_message_post: function (partner_ids) {
do_send_message_post: function (partner_ids, log) {
var self = this;
this.parent_thread.ds_thread._model.call('message_post_user_api', [this.context.default_res_id], {
var values = {
'body': this.$('textarea').val(),
'subject': false,
'parent_id': this.context.default_parent_id,
'attachment_ids': _.map(this.attachment_ids, function (file) {return file.id;}),
'partner_ids': partner_ids,
'context': this.parent_thread.context,
}).done(function (message_id) {
};
if (log) {
values['subtype'] = false;
}
this.parent_thread.ds_thread._model.call('message_post_user_api', [this.context.default_res_id], values).done(function (message_id) {
var thread = self.parent_thread;
var root = thread == self.options.root_thread;
if (self.options.display_indented_thread < self.thread_level && thread.parent_message) {

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

@ -33,6 +33,7 @@
<div class="oe_msg_footer">
<div class="oe_msg_attachment_list"></div>
<button class="oe_post">Send to followers</button>
or <button class="oe_log">Log a note</button>
<t t-call="mail.compose_message.add_attachment"/>
<!--<a class="oe_cancel oe_e">X</a>-->
</div>