else {
this.options.show_read = this.to_read;
this.options.show_unread = !this.to_read;
- this.options.rerender = true;
- this.options.toggle_read = true;
}
+ this.options.rerender = true;
+ this.options.toggle_read = true;
}
this.parent_thread = parent.messages != undefined ? parent : this.options.root_thread;
this.thread = false;
} else {
this.avatar = mail.ChatterUtils.get_image(this.session, 'res.users', 'image_small', this.session.uid);
}
-
+ if (this.author_id && this.author_id[1]) {
+ var email = this.author_id[1].match(/(.*)<(.*@.*)>/);
+ if (!email) {
+ this.author_id.push(_.str.escapeHTML(this.author_id[1]), '', this.author_id[1]);
+ } else {
+ this.author_id.push(_.str.escapeHTML(email[0]), _.str.trim(email[1]), email[2]);
+ }
+ }
},
this.show_compact_message = false;
this.show_delete_attachment = true;
this.emails_from = [];
+ this.partners_from = [];
},
start: function () {
bind_events: function () {
var self = this;
- this.$('textarea.oe_compact').on('focus', _.bind( this.on_compose_expandable, this));
+ this.$('.oe_compact').on('click', _.bind( this.on_compose_expandable, this));
// set the function called when attachments are added
this.$('input.oe_form_binary_file').on('change', _.bind( this.on_attachment_change, this) );
this.$('.oe_cancel').on('click', _.bind( this.on_cancel, this) );
this.$('.oe_post').on('click', _.bind( this.on_message_post, 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));
this.$('.oe_msg_left, .oe_msg_content').on('mouseup', _.bind( function () { this.$('textarea').focus(); }, this));
-
var ev_stay = {};
ev_stay.mouseup = ev_stay.keydown = ev_stay.focus = function () { self.stay_open = false; };
- this.$('textarea:not(.oe_compact)').on(ev_stay);
- this.$('textarea:not(.oe_compact)').autosize();
+ this.$('textarea').on(ev_stay);
+ this.$('textarea').autosize();
// auto close
- this.$('textarea:not(.oe_compact)').on('blur', _.bind( this.on_compose_expandable, this));
+ this.$('textarea').on('blur', _.bind( this.on_compose_expandable, this));
// event: delete child attachments off the oe_msg_attachment_list box
this.$(".oe_msg_attachment_list").on('click', '.oe_delete', this.on_attachment_delete);
this.$(".oe_emails_from").on('change', 'input', this.on_checked_email_from);
+ this.$(".oe_partners_from").on('change', 'input', this.on_checked_partner_from);
},
on_compose_fullmail: function (default_composition_mode) {
-
+ var self = this;
if(!this.do_check_attachment_upload()) {
return false;
}
- if (default_composition_mode == 'reply') {
+ // create list of new partners
+ this.check_recipient_partners().done(function (partner_ids) {
var context = {
'default_composition_mode': default_composition_mode,
- 'default_parent_id': this.id,
- 'default_body': mail.ChatterUtils.get_text2html(this.$el ? (this.$el.find('textarea:not(.oe_compact)').val() || '') : ''),
- 'default_attachment_ids': this.attachment_ids,
+ 'default_parent_id': self.id,
+ 'default_body': mail.ChatterUtils.get_text2html(self.$el ? (self.$el.find('textarea:not(.oe_compact)').val() || '') : ''),
+ 'default_attachment_ids': self.attachment_ids,
+ 'default_partner_ids': partner_ids,
};
- } else {
- var context = {
- 'default_model': this.context.default_model,
- 'default_res_id': this.context.default_res_id,
- 'default_composition_mode': default_composition_mode,
- 'default_parent_id': this.id,
- 'default_body': mail.ChatterUtils.get_text2html(this.$el ? (this.$el.find('textarea:not(.oe_compact)').val() || '') : ''),
- 'default_attachment_ids': this.attachment_ids,
+ 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;
+ }
+
+ var action = {
+ type: 'ir.actions.act_window',
+ res_model: 'mail.compose.message',
+ view_mode: 'form',
+ view_type: 'form',
+ views: [[false, 'form']],
+ target: 'new',
+ context: context,
};
- }
- var action = {
- type: 'ir.actions.act_window',
- res_model: 'mail.compose.message',
- view_mode: 'form',
- view_type: 'form',
- views: [[false, 'form']],
- target: 'new',
- context: context,
- };
- this.do_action(action);
- this.on_cancel();
+ self.do_action(action);
+ self.on_cancel();
+ });
+
},
reinit: function() {
}
},
- /*post a message and fetch the message*/
- on_message_post: function (event) {
+ check_recipient_partners: function () {
var self = this;
-
- var comment_node = this.$('textarea');
- var body = comment_node.val();
-
- if (this.do_check_attachment_upload() && (this.attachment_ids.length || body.match(/\S+/))) {
- //session.web.blockUI();
- var values = [
- this.context.default_res_id, //thread_id
- body, //body
- false, //subject
- this.context.default_parent_id, //parent_id
- _.map(this.attachment_ids, function (file) {return file.id;}), //attachment_ids
- _.map(_.filter(this.emails_from, function (f) {return f[1]}), function (f) {return f[0]}), //extra_email
- this.parent_thread.context, // context
- ];
- this.parent_thread.ds_thread.call('message_post_user_api', values).done(function (record) {
- var thread = self.parent_thread;
- var root = thread == self.options.root_thread;
- if (self.options.display_indented_thread < self.thread_level && thread.parent_message) {
- var thread = thread.parent_message.parent_thread;
- }
- // create object and attach to the thread object
- thread.message_fetch([["id", "=", record.message_id]], false, [record.message_id], function (arg, data) {
- var message = thread.create_message_object( data[0] );
- // insert the message on dom
- thread.insert_message( message, root ? undefined : self.$el, root );
- });
- self.on_cancel();
-
- if (record.new_partner_ids && record.new_partner_ids.length) {
- _.each(record.new_partner_ids, function (id) {
- var pop = new session.web.form.FormOpenPopup(self);
- pop.show_element(
- 'res.partner',
- id,
- self.parent_thread.context,
- {
- title: _t("Please complete partner's informations"),
- }
- );
- });
+ var partners_from = [];
+ var emails = [];
+ _.each(this.emails_from, function (email_from) {
+ if (email_from[1] && !_.find(emails, function (email) {return email == email_from[0][4];})) {
+ emails.push(email_from[0][1]);
+ }
+ });
+ var deferred_check = $.Deferred();
+ if (emails.length == 0) {
+ return deferred_check.resolve(partners_from);
+ }
+ self.parent_thread.ds_thread._model.call('message_create_partners_from_emails', [emails]).then(function (partners) {
+ partners_from = _.clone(partners.partner_ids);
+ var deferreds = [];
+ _.each(partners.new_partner_ids, function (id) {
+ var deferred = $.Deferred()
+ deferreds.push(deferred);
+ var pop = new session.web.form.FormOpenPopup(this);
+ pop.show_element(
+ 'res.partner',
+ id,
+ {
+ 'force_email': true,
+ 'ref': "compound_context",
+ },
+ {
+ title: _t("Please complete partner's informations"),
}
- //session.web.unblockUI();
+ );
+ pop.on('closed', self, function () {
+ deferred.resolve();
});
- return true;
+ partners_from.push(id);
+ });
+ $.when.apply( $, deferreds ).then(function () {
+ deferred_check.resolve(partners_from);
+ });
+ });
+ return deferred_check;
+ },
+
+ on_message_post: function (event) {
+ var self = this;
+ if (this.do_check_attachment_upload() && (this.attachment_ids.length || this.$('textarea').val().match(/\S+/))) {
+ // create list of new partners
+ this.check_recipient_partners().done(function (partner_ids) {
+ self.do_send_message_post(partner_ids);
+ });
}
},
+ /*do post a message and fetch the message*/
+ do_send_message_post: function (partner_ids) {
+ var self = this;
+ this.parent_thread.ds_thread._model.call('message_post_user_api', [this.context.default_res_id], {
+ '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) {
+ var thread = self.parent_thread;
+ var root = thread == self.options.root_thread;
+ if (self.options.display_indented_thread < self.thread_level && thread.parent_message) {
+ var thread = thread.parent_message.parent_thread;
+ }
+ // create object and attach to the thread object
+ thread.message_fetch([["id", "=", message_id]], false, [message_id], function (arg, data) {
+ var message = thread.create_message_object( data[0] );
+ // insert the message on dom
+ thread.insert_message( message, root ? undefined : self.$el, root );
+ });
+ self.on_cancel();
+ });
+ },
+
/* convert the compact mode into the compose message
*/
on_compose_expandable: function (event) {
_.each(this.options.root_thread.messages, function (msg) {messages.push(msg); messages.concat(msg.get_childs());});
}
- var emails_from = _.map(_.filter(messages,
- function (thread) {return thread.author_id && !thread.author_id[0];}),
- function (thread) {return thread.author_id[1];});
-
- return _.each(emails_from, function (email_from) {
- if (!_.find(self.emails_from, function (from) {return from[0] == email_from;})) {
- self.emails_from.push([email_from, true]);
+ _.each(messages, function (thread) {
+ if (thread.author_id && !thread.author_id[0] &&
+ !_.find(self.emails_from, function (from) {return from[0][4] == thread.author_id[4];})) {
+ self.emails_from.push([thread.author_id, true]);
}
});
+ return self.emails_from;
},
on_checked_email_from: function (event) {
var $input = $(event.target);
var email = $input.attr("data");
_.each(this.emails_from, function (email_from) {
- if (email_from[0] == email) {
+ if (email_from[0][4] == email) {
email_from[1] = $input.is(":checked");
}
});
- }
+ },
});
/**
}
var message_ids = _.map(messages, function (val) { return val.id; });
- this.ds_message.call('set_message_read', [message_ids, read_value, this.context])
+ this.ds_message.call('set_message_read', [message_ids, read_value, true, this.context])
.then(function () {
// apply modification
_.each(messages, function (msg) {
var self=this;
var button = self.$('.oe_star:first');
- this.ds_message.call('set_message_starred', [[self.id], !self.is_favorite])
+ this.ds_message.call('set_message_starred', [[self.id], !self.is_favorite, true])
.then(function (star) {
self.is_favorite=star;
if (self.is_favorite) {
* use with browse, fetch... [O]= top parent
*/
init: function (parent, datasets, options) {
+ var self = this;
this._super(parent, options);
this.domain = options.domain || [];
this.context = _.extend(options.context || {});
this.parent_message= parent.thread!= undefined ? parent : false ;
// data of this thread
- this.id = datasets.id || false,
- this.last_id = datasets.last_id || false,
- this.parent_id = datasets.parent_id || false,
-
- this.is_private = datasets.is_private || false,
- this.author_id = datasets.author_id || false,
- this.thread_level = (datasets.thread_level+1) || 0,
- this.partner_ids = _.filter(datasets.partner_ids, function (partner) { return partner[0]!=datasets.author_id[0]; } )
+ this.id = datasets.id || false;
+ this.last_id = datasets.last_id || false;
+ this.parent_id = datasets.parent_id || false;
+ this.is_private = datasets.is_private || false;
+ this.author_id = datasets.author_id || false;
+ this.thread_level = (datasets.thread_level+1) || 0;
+ datasets.partner_ids = datasets.partner_ids || [];
+ if (datasets.author_id && ! _.contains(datasets.partner_ids, datasets.author_id) && datasets.author_id[0]) {
+ datasets.partner_ids.push(datasets.author_id);
+ }
+ this.partner_ids = datasets.partner_ids;
this.messages = [];
this.options.flat_mode = !!(this.options.display_indented_thread > this.thread_level ? this.options.display_indented_thread - this.thread_level : 0);
this.ds_thread = new session.web.DataSetSearch(this, this.context.default_model || 'mail.thread');
this.ds_message = new session.web.DataSetSearch(this, 'mail.message');
+ this.render_mutex = new $.Mutex();
},
start: function () {
(replace_context ? replace_context : this.context),
// parent_id
this.context.default_parent_id || undefined
- ]).done(callback ? _.bind(callback, this, arguments) : this.proxy('switch_new_message'));
+ ]).done(callback ? _.bind(callback, this, arguments) : this.proxy('switch_new_message')
+ ).done(this.proxy('message_fetch_set_read'));
+ },
+
+ message_fetch_set_read: function (message_list) {
+ if (! this.context.mail_read_set_read) return;
+ this.render_mutex.exec(_.bind(function() {
+ msg_ids = _.pluck(message_list, 'id');
+ return this.ds_message.call('set_message_read', [
+ msg_ids, true, false, this.context]);
+ }, this));
},
/**
this.node.params = _.extend({
'display_indented_thread': -1,
'show_reply_button': false,
- 'show_read_unread_button': false,
+ 'show_read_unread_button': true,
+ 'read_action': 'unread',
'show_record_name': false,
'show_compact_message': 1,
}, this.node.params);
}
this.domain = this.node.params && this.node.params.domain || [];
+
+ if (!this.__parentedParent.is_action_enabled('edit')) {
+ this.node.params.show_link = false;
+ }
},
start: function () {
'show_compose_message': this.view.is_action_enabled('edit'),
});
this.node.context = {
+ 'mail_read_set_read': true, // set messages as read in Chatter
'default_res_id': this.view.datarecord.id || false,
'default_model': this.view.model || false,
};
this.defaults[key.replace(/^search_default_/, '')] = this.context[key];
}
}
-
this.action.params = _.extend({
'display_indented_thread': 1,
'show_reply_button': true,
projects / odoo / odoo.git / blobdiff