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

[IMP] mail: annimate destroy with context: typeof_thread 

bzr revid: chm@openerp.com-20121016114538-d8duv76u7nqyv5ji
This commit is contained in:
Christophe Matthieu 2012-10-16 13:45:38 +02:00
parent 0e4fcab679
commit db22e146ec
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -652,11 +652,13 @@ openerp.mail = function(session) {
// if this message is read, all childs message display is read // if this message is read, all childs message display is read
var ids = [this.datasets.id].concat( this.get_child_ids() ); var ids = [this.datasets.id].concat( this.get_child_ids() );
var read = $(event.srcElement).hasClass("oe_read"); var read = $(event.srcElement).hasClass("oe_read");
this.$el.removeClass("oe_mail_"+(read?"un":"")+"read").addClass("oe_mail_"+(read?"":"un")+"read"); this.$el.removeClass("oe_mail_" + (read?"un":"") + "read").addClass("oe_mail_" + (read?"":"un") + "read");
if( (read && this.options.thread.typeof_thread=='inbox') ||
(!read && this.options.thread.typeof_thread=='archives')) { if( (read && this.options.thread.typeof_thread == 'inbox') ||
(!read && this.options.thread.typeof_thread == 'archives')) {
this.animated_destroy({fadeTime:250}); this.animated_destroy({fadeTime:250});
} }
this.ds_notification.call('set_message_read', [ids,read]); this.ds_notification.call('set_message_read', [ids,read]);
return false; return false;
}, },
@ -736,12 +738,16 @@ openerp.mail = function(session) {
on_star: function (event) { on_star: function (event) {
event.stopPropagation(); event.stopPropagation();
var self=this; var self=this;
var button = self.$('button.oe_mail_starbox:first');
return this.ds_message.call('star_toggle', [[self.datasets.id]]).pipe(function(star){ return this.ds_message.call('star_toggle', [[self.datasets.id]]).pipe(function(star){
self.datasets.has_stared=star; self.datasets.has_stared=star;
if(self.datasets.has_stared){ if(self.datasets.has_stared){
self.$('button.oe_mail_starbox:first').addClass('oe_stared'); button.addClass('oe_stared');
} else { } else {
self.$('button.oe_mail_starbox:first').removeClass('oe_stared'); button.removeClass('oe_stared');
if( self.options.thread.typeof_thread == 'stared' ) {
self.animated_destroy({fadeTime:250});
}
} }
}); });
return false; return false;
@ -1021,8 +1027,6 @@ openerp.mail = function(session) {
fetch_context = replace_context ? replace_context : this.context; fetch_context = replace_context ? replace_context : this.context;
fetch_context.message_loaded= [this.datasets.id||0].concat( self.options.thread._parents[0].get_child_ids() ); fetch_context.message_loaded= [this.datasets.id||0].concat( self.options.thread._parents[0].get_child_ids() );
console.log(fetch_domain, 0, fetch_context, this.context.default_parent_id);
return this.ds_message.call('message_read', [ids, fetch_domain, 0, fetch_context, this.context.default_parent_id || undefined] return this.ds_message.call('message_read', [ids, fetch_domain, 0, fetch_context, this.context.default_parent_id || undefined]
).then(function (records) { self.switch_new_message(records); }); ).then(function (records) { self.switch_new_message(records); });
}, },
@ -1161,7 +1165,6 @@ openerp.mail = function(session) {
/* Send the records to his parent thread */ /* Send the records to his parent thread */
switch_new_message: function(records) { switch_new_message: function(records) {
var self=this; var self=this;
console.log(records);
_(records).each(function(record){ _(records).each(function(record){
self.browse_thread({ self.browse_thread({
'id': record.parent_id, 'id': record.parent_id,

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

@ -186,8 +186,8 @@
<ul class="oe_header"> <ul class="oe_header">
<li class="placeholder-mail-vote"><t t-call="mail.thread.message.vote"/></li> <li class="placeholder-mail-vote"><t t-call="mail.thread.message.vote"/></li>
<li class="placeholder-mail-star"><t t-call="mail.thread.message.star"/></li> <li class="placeholder-mail-star"><t t-call="mail.thread.message.star"/></li>
<li t-if="!widget.options.thread.display_on_hierarchy[0] and widget.datasets.read=='unread'" title="Read" class="oe_read"><a class="oe_read oe_e">W</a></li> <li t-if="!widget.options.thread.display_on_hierarchy[0]" title="Read" class="oe_read"><a class="oe_read oe_e">W</a></li>
<li t-if="!widget.options.thread.display_on_hierarchy[0] and widget.datasets.read=='read'" title="Set back to unread" class="oe_unread"><a class="oe_unread oe_e">h</a></li> <li t-if="!widget.options.thread.display_on_hierarchy[0]" title="Set back to unread" class="oe_unread"><a class="oe_unread oe_e">h</a></li>
<li title="Quick reply"><a class="oe_reply oe_e">)</a></li> <li title="Quick reply"><a class="oe_reply oe_e">)</a></li>
<t t-if="(widget.datasets.is_author and widget.options.message.show_dd_delete) or widget.datasets.type == 'email'"> <t t-if="(widget.datasets.is_author and widget.options.message.show_dd_delete) or widget.datasets.type == 'email'">
<li> <li>