@@ -81,7 +82,6 @@
- 0:
+ result.append({
+ 'domain': [['id','>=',id_min],['id','<=',id_max],['parent_id','=',id_msg]],
+ 'nb_messages': nb,
+ 'type': 'expandable',
+ 'parent_id': id_msg,
+ 'id': id_min
+ })
+ nb=0
+ if nb>0:
+ result.append({
+ 'domain': [['id','>=',id_min],['parent_id','=',id_msg]],
+ 'nb_messages': nb,
+ 'type': 'expandable',
+ 'parent_id': id_msg,
+ 'id': id_min
+ })
+
+
+ # expandable for limit max
+ ids = self.search(cr, SUPERUSER_ID, domain+[['id','not in',message_loaded+tree+tree_not]], context=context, limit=1)
+ if len(ids) > 0:
+ result.append(
+ {
+ 'domain': domain,
+ 'nb_messages': 0,
+ 'type': 'expandable',
+ 'parent_id': parent_id,
+ 'id': -1
+ });
+
+
+ result = sorted(result, key=lambda k: k['id'])
- # Flatten the result
- if thread_level > 0:
- result = self.message_read_tree_flatten(cr, uid, result, 0, thread_level, context=context)
return result
#------------------------------------------------------
@@ -409,7 +504,7 @@ class mail_message(osv.Model):
if not values.get('message_id') and values.get('res_id') and values.get('model'):
values['message_id'] = tools.generate_tracking_message_id('%(model)s-%(res_id)s' % values)
newid = super(mail_message, self).create(cr, uid, values, context)
- self.notify(cr, uid, newid, context=context)
+ self._notify(cr, 1, newid, context=context)
return newid
def read(self, cr, uid, ids, fields=None, context=None, load='_classic_read'):
@@ -431,26 +526,39 @@ class mail_message(osv.Model):
self.pool.get('ir.attachment').unlink(cr, uid, attachments_to_delete, context=context)
return super(mail_message, self).unlink(cr, uid, ids, context=context)
- def notify(self, cr, uid, newid, context=None):
+ def _notify(self, cr, uid, newid, context=None):
""" Add the related record followers to the destination partner_ids.
Call mail_notification.notify to manage the email sending
"""
message = self.browse(cr, uid, newid, context=context)
partners_to_notify = set([])
- # add all partner_ids of the message
+ # message has no subtype_id: pure log message -> no partners, no one notified
+ if not message.subtype_id:
+ message.write({'partner_ids': [5]})
+ return True
+ # all partner_ids of the mail.message have to be notified
if message.partner_ids:
partners_to_notify |= set(partner.id for partner in message.partner_ids)
- # add all followers and set add them in partner_ids
+ # all followers of the mail.message document have to be added as partners and notified
if message.model and message.res_id:
- record = self.pool.get(message.model).browse(cr, SUPERUSER_ID, message.res_id, context=context)
- extra_notified = set(partner.id for partner in record.message_follower_ids)
+ fol_obj = self.pool.get("mail.followers")
+ fol_ids = fol_obj.search(cr, uid, [('res_model', '=', message.model), ('res_id', '=', message.res_id), ('subtype_ids', 'in', message.subtype_id.id)], context=context)
+ fol_objs = fol_obj.browse(cr, uid, fol_ids, context=context)
+ extra_notified = set(fol.partner_id.id for fol in fol_objs)
missing_notified = extra_notified - partners_to_notify
+ missing_notified = missing_notified
if missing_notified:
self.write(cr, SUPERUSER_ID, [newid], {'partner_ids': [(4, p_id) for p_id in missing_notified]}, context=context)
partners_to_notify |= extra_notified
- # # remove uid from partners
- self.write(cr, SUPERUSER_ID, [newid], {'partner_ids': [(3, uid)]}, context=context)
- self.pool.get('mail.notification').notify(cr, uid, list(partners_to_notify), newid, context=context)
+
+ # add myself if I wrote on my wall,
+ # unless remove myself author
+ if ((message.model=="res.partner" and message.res_id==message.author_id.id)):
+ self.write(cr, SUPERUSER_ID, [newid], {'partner_ids': [(4, message.author_id.id)]}, context=context)
+ else:
+ self.write(cr, SUPERUSER_ID, [newid], {'partner_ids': [(3, message.author_id.id)]}, context=context)
+
+ self.pool.get('mail.notification')._notify(cr, uid, newid, context=context)
def copy(self, cr, uid, id, default=None, context=None):
"""Overridden to avoid duplicating fields that are unique to each email"""
diff --git a/addons/mail/mail_message_subtype.py b/addons/mail/mail_message_subtype.py
new file mode 100644
index 00000000000..32b20d9c11e
--- /dev/null
+++ b/addons/mail/mail_message_subtype.py
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2012-today OpenERP SA ()
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see
+
+
+
+ mail.message.subtype.tree
+ mail.message.subtype
+ 10
+
+
+
+
+
+
+
+ mail.message.subtype.form
+ mail.message.subtype
+
+
+
+
+
+
+ Subtypes
+ mail.message.subtype
+ form
+ tree,form
+
+
+
+
+
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 8e7129e8165..cc0419352af 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -31,6 +31,7 @@
form
tree,form
{'search_default_unread_message':True}
-
- News Feed
+
+ Inbox
mail.wall
-
-
- My Posts
+
+ Archives
+ mail.wall
+
+
+
+ Sent
mail.wall
9 %d + %d" % (cls, len(thread['message_comment_ids']), len(thread['message_follower_ids']))
- res[thread['id']]['message_is_follower'] = partner_id in thread['message_follower_ids']
+ for thread in self.browse(cr, uid, ids, context=context):
+ cls = res[thread.id]['message_unread'] and ' class="oe_kanban_mail_new"' or ''
+ res[thread.id]['message_summary'] = "9 %d + %d" % (cls, len(thread.message_comment_ids), len(thread.message_follower_ids))
+
+ return res
+
+ def _get_subscription_data(self, cr, uid, ids, name, args, context=None):
+ """ Computes:
+ - message_is_follower: is uid in the document followers
+ - message_subtype_data: data about document subtypes: which are
+ available, which are followed if any """
+ res = dict((id, dict(message_subtype_data='', message_is_follower=False)) for id in ids)
+ user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
+
+ # find current model subtypes, add them to a dictionary
+ subtype_obj = self.pool.get('mail.message.subtype')
+ subtype_ids = subtype_obj.search(cr, uid, ['|', ('res_model', '=', self._name), ('res_model', '=', False)], context=context)
+ subtype_dict = dict((subtype.name, dict(default=subtype.default, followed=False, id=subtype.id)) for subtype in subtype_obj.browse(cr, uid, subtype_ids, context=context))
+ for id in ids:
+ res[id]['message_subtype_data'] = subtype_dict.copy()
+
+ # find the document followers, update the data
+ fol_obj = self.pool.get('mail.followers')
+ fol_ids = fol_obj.search(cr, uid, [
+ ('partner_id', '=', user_pid),
+ ('res_id', 'in', ids),
+ ('res_model', '=', self._name),
+ ], context=context)
+ for fol in fol_obj.browse(cr, uid, fol_ids, context=context):
+ thread_subtype_dict = res[fol.res_id]['message_subtype_data']
+ res[fol.res_id]['message_is_follower'] = True
+ for subtype in fol.subtype_ids:
+ thread_subtype_dict[subtype.name]['followed'] = True
+ res[fol.res_id]['message_subtype_data'] = thread_subtype_dict
+
return res
def _search_unread(self, cr, uid, obj=None, name=None, domain=None, context=None):
@@ -152,8 +187,13 @@ class mail_thread(osv.AbstractModel):
return [('id', 'in', res.keys())]
_columns = {
- 'message_is_follower': fields.function(_get_message_data,
- type='boolean', string='Is a Follower', multi='_get_message_data'),
+ 'message_is_follower': fields.function(_get_subscription_data,
+ type='boolean', string='Is a Follower', multi='_get_subscription_data,'),
+ 'message_subtype_data': fields.function(_get_subscription_data,
+ type='text', string='Subscription data', multi="_get_subscription_data",
+ help="Holds data about the subtypes. The content of this field "\
+ "is a structure holding the current model subtypes, and the "\
+ "current document followed subtypes."),
'message_follower_ids': many2many_reference('res.partner',
'mail_followers', 'res_id', 'partner_id',
reference_column='res_model', string='Followers'),
@@ -571,12 +611,12 @@ class mail_thread(osv.AbstractModel):
"now deprecated res.log.")
self.message_post(cr, uid, [id], message, context=context)
- def message_post(self, cr, uid, thread_id, body='', subject=False,
- type='notification', parent_id=False, attachments=None, context=None, **kwargs):
+ def message_post(self, cr, uid, thread_id, body='', subject=None, type='notification',
+ subtype=None, parent_id=False, attachments=None, context=None, **kwargs):
""" Post a new message in an existing thread, returning the new
mail.message ID. Extra keyword arguments will be used as default
column values for the new mail.message record.
-
+ Auto link messages for same id and object
:param int thread_id: thread ID to post into, or list with one ID
:param str body: body of the message, usually raw HTML that will
be sanitized
@@ -587,9 +627,10 @@ class mail_thread(osv.AbstractModel):
``(name,content)``, where content is NOT base64 encoded
:return: ID of newly created mail.message
"""
+
context = context or {}
attachments = attachments or []
- assert (not thread_id) or isinstance(thread_id, (int,long)) or \
+ assert (not thread_id) or isinstance(thread_id, (int, long)) or \
(isinstance(thread_id, (list, tuple)) and len(thread_id) == 1), "Invalid thread_id"
if isinstance(thread_id, (list, tuple)):
thread_id = thread_id and thread_id[0]
@@ -608,39 +649,86 @@ class mail_thread(osv.AbstractModel):
}
attachment_ids.append((0, 0, data_attach))
+ # get subtype
+ if not subtype:
+ subtype = 'mail.mt_comment'
+ s = subtype.split('.')
+ if len(s)==1:
+ s = ('mail', s[0])
+ ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, s[0], s[1])
+ subtype_id = ref and ref[1] or False
+
+ model = context.get('thread_model', self._name) if thread_id else False
+ messages = self.pool.get('mail.message')
+
+ #auto link messages for same id and object
+ if self._mail_autothread and thread_id:
+ message_ids = messages.search(cr, uid, ['&',('res_id', '=', thread_id),('model','=',model)], context=context)
+ if len(message_ids):
+ parent_id = min(message_ids)
+
+
values = kwargs
values.update({
- 'model': context.get('thread_model', self._name) if thread_id else False,
+ 'model': model,
'res_id': thread_id or False,
'body': body,
- 'subject': subject,
+ 'subject': subject or False,
'type': type,
'parent_id': parent_id,
'attachment_ids': attachment_ids,
+ 'subtype_id': subtype_id,
})
- for x in ('from', 'to', 'cc'): values.pop(x, None) # Avoid warnings
- return self.pool.get('mail.message').create(cr, uid, values, context=context)
+ # Avoid warnings about non-existing fields
+ for x in ('from', 'to', 'cc'):
+ values.pop(x, None)
+
+ return messages.create(cr, uid, values, context=context)
#------------------------------------------------------
# Followers API
#------------------------------------------------------
- def message_subscribe_users(self, cr, uid, ids, user_ids=None, context=None):
+ def message_post_api(self, cr, uid, thread_id, body='', subject=False, type='notification',
+ subtype=None, parent_id=False, attachments=None, context=None, **kwargs):
+ added_message_id = self.message_post(cr, uid, thread_id=thread_id, body=body, subject=subject, type=type,
+ subtype=subtype, parent_id=parent_id, attachments=attachments, context=context)
+ added_message = self.pool.get('mail.message').message_read(cr, uid, [added_message_id])
+
+ return added_message
+
+ def get_message_subtypes(self, cr, uid, ids, context=None):
+ """ message_subtype_data: data about document subtypes: which are
+ available, which are followed if any """
+ return self._get_subscription_data(cr, uid, ids, None, None, context=context)
+
+ def message_subscribe_users(self, cr, uid, ids, user_ids=None, subtype_ids=None, context=None):
""" Wrapper on message_subscribe, using users. If user_ids is not
provided, subscribe uid instead. """
- if not user_ids: user_ids = [uid]
- partner_ids = [user['partner_id'][0] for user in self.pool.get('res.users').read(cr, uid, user_ids, ['partner_id'], context=context)]
- return self.message_subscribe(cr, uid, ids, partner_ids, context=context)
+ if not user_ids:
+ user_ids = [uid]
+ partner_ids = [user.partner_id.id for user in self.pool.get('res.users').browse(cr, uid, user_ids, context=context)]
+ return self.message_subscribe(cr, uid, ids, partner_ids, subtype_ids=subtype_ids, context=context)
- def message_subscribe(self, cr, uid, ids, partner_ids, context=None):
+ def message_subscribe(self, cr, uid, ids, partner_ids, subtype_ids=None, context=None):
""" Add partners to the records followers. """
- return self.write(cr, uid, ids, {'message_follower_ids': [(4, pid) for pid in partner_ids]}, context=context)
+ self.write(cr, uid, ids, {'message_follower_ids': [(4, pid) for pid in partner_ids]}, context=context)
+ # if subtypes are not specified (and not set to a void list), fetch default ones
+ if subtype_ids is None:
+ subtype_obj = self.pool.get('mail.message.subtype')
+ subtype_ids = subtype_obj.search(cr, uid, [('default', '=', True), '|', ('res_model', '=', self._name), ('res_model', '=', False)], context=context)
+ # update the subscriptions
+ fol_obj = self.pool.get('mail.followers')
+ fol_ids = fol_obj.search(cr, uid, [('res_model', '=', self._name), ('res_id', 'in', ids), ('partner_id', 'in', partner_ids)], context=context)
+ fol_obj.write(cr, uid, fol_ids, {'subtype_ids': [(6, 0, subtype_ids)]}, context=context)
+ return True
def message_unsubscribe_users(self, cr, uid, ids, user_ids=None, context=None):
""" Wrapper on message_subscribe, using users. If user_ids is not
provided, unsubscribe uid instead. """
- if not user_ids: user_ids = [uid]
- partner_ids = [user['partner_id'][0] for user in self.pool.get('res.users').read(cr, uid, user_ids, ['partner_id'], context=context)]
+ if not user_ids:
+ user_ids = [uid]
+ partner_ids = [user.partner_id.id for user in self.pool.get('res.users').browse(cr, uid, user_ids, context=context)]
return self.message_unsubscribe(cr, uid, ids, partner_ids, context=context)
def message_unsubscribe(self, cr, uid, ids, partner_ids, context=None):
@@ -674,3 +762,5 @@ class mail_thread(osv.AbstractModel):
partner_id = %s
''', (ids, self._name, partner_id))
return True
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index b4b1aade755..3507e7c449f 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -12,16 +12,22 @@
-
- My Feeds
+
+ Inbox
-
- My Posts
+
+ Archives
+
+ Sent
+
diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py
index 2988cee3d9c..363ea74d16c 100644
--- a/addons/mail/res_partner.py
+++ b/addons/mail/res_partner.py
@@ -25,6 +25,7 @@ class res_partner_mail(osv.Model):
""" Update partner to add a field about notification preferences """
_name = "res.partner"
_inherit = ['res.partner', 'mail.thread']
+ _mail_autothread = False
_columns = {
'notification_email_send': fields.selection([
@@ -41,5 +42,4 @@ class res_partner_mail(osv.Model):
'notification_email_send': lambda *args: 'comment'
}
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/res_partner_view.xml b/addons/mail/res_partner_view.xml
index 5c051fc89b3..2a8430926d5 100644
--- a/addons/mail/res_partner_view.xml
+++ b/addons/mail/res_partner_view.xml
@@ -9,7 +9,6 @@
- this.options._expandable_max){
+ this.list_ul.find('>li:gt('+(this.options._expandable_max-1)+')').hide();
+ this.more_msg.show();
+ } else {
+ this.list_ul.find('>li').show();
+ this.more_msg.hide();
}
},
display_user_avatar: function () {
var avatar = mail.ChatterUtils.get_image(this.session, 'res.users', 'image_small', this.session.uid);
- return this.$el.find('img.oe_mail_icon').attr('src', avatar);
+ return this.$('img.oe_mail_icon').attr('src', avatar);
},
- message_post: function (body) {
- var self = this;
- if (! body) {
- var comment_node = this.$el.find('textarea');
- var body = comment_node.val();
- comment_node.val('');
- }
- return this.ds_thread.call('message_post', [
- [this.context.default_res_id], body, false, 'comment', this.context.default_parent_id, undefined]
- ).then(self.message_fetch());
+ /* Send the records to his parent thread */
+ switch_new_message: function(records) {
+ var self=this;
+ _(records).each(function(record){
+ self.browse_thread({
+ 'id': record.parent_id,
+ 'default_return_top_thread':true
+ }).create_message_object( record );
+ });
},
-
- /** Action: 'shows more' to fetch new messages */
- do_message_fetch_more: function () {
- return this.message_fetch(false, this.fetch_more_domain, this.fetch_more_context);
- },
-
- // TDE: keep currently because need something similar
- // /**
- // * Create a domain to fetch new comments according to
- // * comment already present in comments_structure
- // * @param {Object} comments_structure (see chatter utils)
- // * @returns {Array} fetch_domain (OpenERP domain style)
- // */
- // get_fetch_domain: function (comments_structure) {
- // var domain = [];
- // var ids = comments_structure.root_ids.slice();
- // var ids2 = [];
- // // must be child of current parent
- // if (this.options.parent_id) { domain.push(['id', 'child_of', this.options.parent_id]); }
- // _(comments_structure.root_ids).each(function (id) { // each record
- // ids.push(id);
- // ids2.push(id);
- // });
- // if (this.options.parent_id != false) {
- // ids2.push(this.options.parent_id);
- // }
- // // must not be children of already fetched messages
- // if (ids.length > 0) {
- // domain.push('&');
- // domain.push('!');
- // domain.push(['id', 'child_of', ids]);
- // }
- // if (ids2.length > 0) {
- // domain.push(['id', 'not in', ids2]);
- // }
- // return domain;
- // },
});
@@ -632,7 +1021,7 @@ openerp.mail = function(session) {
var self = this;
this._super.apply(this, arguments);
if (! this.view.datarecord.id || session.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
- this.$el.find('oe_mail_thread').hide();
+ this.$('oe_mail_thread').hide();
return;
}
// update context
@@ -644,14 +1033,31 @@ openerp.mail = function(session) {
// create and render Thread widget
var show_header_compose = this.view.is_action_enabled('edit') ||
(this.getParent().fields.message_is_follower && this.getParent().fields.message_is_follower.get_value());
- this.$el.find('div.oe_mail_recthread_main').empty();
- var thread = new mail.Thread(self, domain, this.options.context,
- { 'thread_level': this.options.thread_level,
- 'show_header_compose': show_header_compose,
- 'use_composer': show_header_compose,
- 'show_dd_delete': true,
- 'show_reply_by_email': show_header_compose });
- return thread.appendTo(this.$el.find('div.oe_mail_recthread_main'));
+
+ this.thread = new mail.Thread(self, {
+ 'domain': domain,
+ 'context': this.options.context,
+ 'options':{
+ 'thread':{
+ 'thread_level': this.options.thread_level,
+ 'show_header_compose': show_header_compose,
+ 'use_composer': show_header_compose,
+ 'display_on_flat':true
+ },
+ 'message':{
+ 'show_dd_delete': true,
+ 'show_reply_by_email': show_header_compose,
+ }
+ },
+ 'parameters': {},
+ }
+ );
+
+ this.$('ul.oe_mail_wall_threads').empty();
+ var render_res = session.web.qweb.render('mail.wall_thread_container', {});
+ $(render_res).appendTo(this.$('ul.oe_mail_wall_threads'));
+
+ return this.thread.appendTo( this.$('li.oe_mail_wall_thread:last') );
},
});
@@ -703,7 +1109,7 @@ openerp.mail = function(session) {
load_searchview: function (defaults, hidden) {
var self = this;
this.searchview = new session.web.SearchView(this, this.ds_msg, false, defaults || {}, hidden || false);
- return this.searchview.appendTo(this.$el.find('.oe_view_manager_view_search')).then(function () {
+ return this.searchview.appendTo(this.$('.oe_view_manager_view_search')).then(function () {
self.searchview.on_search.add(self.do_searchview_search);
});
},
@@ -724,25 +1130,41 @@ openerp.mail = function(session) {
}, function (results) {
self.search_results['context'] = results.context;
self.search_results['domain'] = results.domain;
- self.search_results['groupby'] = results.group_by;
+ self.thread.destroy();
return self.message_render();
});
},
/** Clean and display the threads */
- message_render: function () {
- this.$el.find('ul.oe_mail_wall_threads').empty();
+ message_render: function (search) {
var domain = this.options.domain.concat(this.search_results['domain']);
- var render_res = session.web.qweb.render('mail.wall_thread_container', {});
- $(render_res).appendTo(this.$el.find('ul.oe_mail_wall_threads'));
- var thread = new mail.Thread(this, domain, this.options.context,
- { 'thread_level': this.options.thread_level,
- 'use_composer': true,
- 'show_reply': this.options.thread_level > 0,
- 'show_dd_hide': true,
+
+ var domain = _.extend(this.options.domain, search&&search.domain? search.domain : {});
+ var context = _.extend(this.options.context, search&&search.context ? search.context : {});
+
+ this.thread = new mail.Thread(this, {
+ 'domain' : domain,
+ 'context' : context,
+ 'options': {
+ 'thread' :{
+ 'thread_level': this.options.thread_level,
+ 'use_composer': true,
+ 'show_header_compose': 1,
+ },
+ 'message': {
+ 'show_reply': this.options.thread_level > 0,
+ 'show_dd_hide': true,
+ },
+ },
+ 'parameters': {},
}
);
- return thread.appendTo(this.$el.find('li.oe_mail_wall_thread:last'));
+
+ this.$('ul.oe_mail_wall_threads').empty();
+ var render_res = session.web.qweb.render('mail.wall_thread_container', {});
+ $(render_res).appendTo(this.$('ul.oe_mail_wall_threads'));
+
+ return this.thread.appendTo( this.$('li.oe_mail_wall_thread:last') );
},
});
};
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 743c4704330..953b8cd9fc8 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -29,7 +29,9 @@ openerp_mail_followers = function(session, mail) {
this.options.context = this.node.attrs.context;
this.options.comment = this.node.attrs.help || false;
this.ds_model = new session.web.DataSetSearch(this, this.view.model);
+ this.sub_model = new session.web.DataSetSearch(this,'mail.message.subtype');
this.ds_follow = new session.web.DataSetSearch(this, this.field.relation);
+ this.follower_model = new session.web.DataSetSearch(this,'mail.followers');
},
start: function() {
@@ -51,11 +53,33 @@ openerp_mail_followers = function(session, mail) {
bind_events: function() {
var self = this;
- this.$('button.oe_mail_button_unfollow').on('click', function () { self.do_unfollow(); })
- .mouseover(function () { $(this).html('Unfollow').removeClass('oe_mail_button_mouseout').addClass('oe_mail_button_mouseover'); })
- .mouseleave(function () { $(this).html('Following').removeClass('oe_mail_button_mouseover').addClass('oe_mail_button_mouseout'); });
- this.$el.on('click', 'button.oe_mail_button_follow', function () { self.do_follow(); });
- this.$el.on('click', 'a.oe_mail_invite', function(event) {
+ this.$('div.oe_mouse_subtypes')
+ .on('mouseover', function () {
+ $(this).removeClass('oe_mouseout').addClass('oe_mouseover');
+ self.display_subtypes();
+ })
+ .on('mouseleave', function () {
+ $(this).removeClass('oe_mouseover').addClass('oe_mouseout');
+ self.display_subtypes();
+ });
+
+ this.$('button.oe_follower')
+ .on('click', function () {
+ if($(this).hasClass('oe_notfollow'))
+ self.do_follow();
+ else
+ self.do_unfollow();
+ })
+ .on('mouseover', function () {
+ $(this).removeClass('oe_mouseout').addClass('oe_mouseover');
+ })
+ .on('mouseleave', function () {
+ $(this).removeClass('oe_mouseover').addClass('oe_mouseout');
+ });
+
+ this.$el.on('click', 'ul.oe_subtypes input', function () { self.do_update_subscription(); })
+
+ this.$el.on('click', 'button.oe_invite', function(event) {
action = {
type: 'ir.actions.act_window',
res_model: 'mail.wizard.invite',
@@ -74,28 +98,35 @@ openerp_mail_followers = function(session, mail) {
read_value: function() {
var self = this;
- return this.ds_model.read_ids([this.view.datarecord.id], ['message_is_follower', 'message_follower_ids']).then(function (results) {
- self.set_value(results[0].message_follower_ids, results[0].message_is_follower);
+ return this.ds_model.read_ids([this.view.datarecord.id], ['message_follower_ids']).pipe(function (results) {
+ self.set_value(results[0].message_follower_ids);
});
},
- set_value: function(value_, message_is_follower) {
+ set_value: function(value_) {
this.reinit();
- if (! this.view.datarecord.id ||
- session.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
- this.$('div.oe_mail_recthread_aside').hide();
- return;
+ return this.fetch_followers(value_ || this.get_value());
+ },
+
+ set_is_follower: function(value_) {
+ for(var i in value_){
+ if(value_[i]['user_ids'][0]==this.session.uid)
+ this.message_is_follower=true;
+ this.display_buttons();
+ return true;
}
- return this.fetch_followers(value_ || this.get_value(), message_is_follower);
+ this.message_is_follower=false;
+ this.display_buttons();
+ return false;
},
- fetch_followers: function (value_, message_is_follower) {
- this.value = value_;
- this.message_is_follower = message_is_follower || (this.getParent().fields.message_is_follower && this.getParent().fields.message_is_follower.get_value());
- return this.ds_follow.call('read', [value_, ['name', 'user_ids']]).pipe(this.proxy('display_followers'), this.proxy('display_generic'));
+ fetch_followers: function (value_) {
+ this.value = value_ || {};
+ this.message_is_follower = (this.getParent().fields.message_is_follower && this.getParent().fields.message_is_follower.get_value());
+ if(value_)
+ return this.ds_follow.call('read', [this.value, ['name', 'user_ids']]).pipe(this.proxy('display_followers'), this.proxy('display_generic'));
},
-
/* Display generic info about follower, for people not having access to res_partner */
display_generic: function (error, event) {
event.preventDefault();
@@ -117,32 +148,88 @@ openerp_mail_followers = function(session, mail) {
display_followers: function (records) {
var self = this;
var node_user_list = this.$('ul.oe_mail_followers_display').empty();
- this.$('div.oe_mail_recthread_followers h4').html(this.options.title + ' (' + records.length + ')');
- _(records).each(function (record) {
+ this.$('div.oe_mail_recthread_followers h4').html(this.options.title + (records.length>=5 ? ' (' + records.length + ')' : '') );
+ console.log(records);
+ for(var i=0; i
-
+
-
-
+
+
-
-
+
![User img]()
@@ -93,72 +93,90 @@
container, holding the composition form. Then come the various
messages. Then comes the 'more' button.
-->
-
-
+
-
+
-
- -
+
- + + +
+ + +- +
-+ +- -
+ diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml index 203a7bce789..a6df1f0fe8c 100644 --- a/addons/mail/static/src/xml/mail_followers.xml +++ b/addons/mail/static/src/xml/mail_followers.xml @@ -3,12 +3,20 @@- -votes - ', message.body, 'mail.message body is incorrect') - self.assertEqual(message.parent_id and message.parent_id.id, parent_id, 'mail.message parent_id incorrect') + self.assertEqual(compose.subject, _msg_reply, 'mail.message incorrect subject') + self.assertIn('Administrator wrote:- - ++ +++@@ -16,8 +24,9 @@ +@@ -30,6 +39,19 @@-
· Invite partners ++ - +
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py index 7a84a2abd78..7ec37d952bc 100644 --- a/addons/mail/tests/test_mail.py +++ b/addons/mail/tests/test_mail.py @@ -131,9 +131,12 @@ class test_mail(TestMailMockups): self.mail_message = self.registry('mail.message') self.mail_notification = self.registry('mail.notification') self.mail_followers = self.registry('mail.followers') + self.mail_message_subtype = self.registry('mail.message.subtype') self.res_users = self.registry('res.users') self.res_partner = self.registry('res.partner') + self.user_demo = self.registry('ir.model.data').get_object_reference(self.cr, self.uid, 'base', 'user_demo')[1] + # Mock send_get_mail_body to test its functionality without other addons override self._send_get_mail_body = self.registry('mail.mail').send_get_mail_body self.registry('mail.mail').send_get_mail_body = self._mock_send_get_mail_body @@ -252,30 +255,64 @@ class test_mail(TestMailMockups): follower_ids = set([follower.partner_id.id for follower in self.mail_followers.browse(cr, uid, fol_obj_ids)]) self.assertEqual(follower_ids, set([partner_bert_id, user_admin.partner_id.id]), 'Bert and Admin should be the followers of dummy mail.group data') - def test_11_message_followers(self): - """ Tests designed for the subscriber API. """ + def test_11_message_followers_and_subtypes(self): + """ Tests designed for the subscriber API as well as message subtypes """ cr, uid = self.cr, self.uid user_admin = self.res_users.browse(cr, uid, uid) group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id) - - # Create user Raoul + # Data: user Raoul user_raoul_id = self.res_users.create(cr, uid, {'name': 'Raoul Grosbedon', 'login': 'raoul'}) user_raoul = self.res_users.browse(cr, uid, user_raoul_id) + # Data: message subtypes + self.mail_message_subtype.create(cr, uid, {'name': 'mt_mg_def', 'default': True, 'res_model': 'mail.group'}) + self.mail_message_subtype.create(cr, uid, {'name': 'mt_other_def', 'default': True, 'res_model': 'crm.lead'}) + self.mail_message_subtype.create(cr, uid, {'name': 'mt_all_def', 'default': True, 'res_model': False}) + mt_mg_nodef = self.mail_message_subtype.create(cr, uid, {'name': 'mt_mg_nodef', 'default': False, 'res_model': 'mail.group'}) + mt_all_nodef = self.mail_message_subtype.create(cr, uid, {'name': 'mt_all_nodef', 'default': False, 'res_model': False}) + default_group_subtypes = self.mail_message_subtype.search(cr, uid, [('default', '=', True), '|', ('res_model', '=', 'mail.group'), ('res_model', '=', False)]) - # Subscribe Raoul three times (niak niak) through message_subscribe_users + # ---------------------------------------- + # CASE1: test subscriptions with subtypes + # ---------------------------------------- + + # Do: Subscribe Raoul three times (niak niak) through message_subscribe_users group_pigs.message_subscribe_users([user_raoul_id, user_raoul_id]) group_pigs.message_subscribe_users([user_raoul_id]) group_pigs.refresh() + # Test: 2 followers (Admin and Raoul) follower_ids = [follower.id for follower in group_pigs.message_follower_ids] self.assertEqual(len(follower_ids), 2, 'There should be 2 Pigs fans') self.assertEqual(set(follower_ids), set([user_raoul.partner_id.id, user_admin.partner_id.id]), 'Admin and Raoul should be the only 2 Pigs fans') + # Test: Raoul follows default subtypes + fol_ids = self.mail_followers.search(cr, uid, [('res_model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id), ('partner_id', '=', user_raoul.partner_id.id)]) + fol_obj = self.mail_followers.browse(cr, uid, fol_ids)[0] + fol_subtype_ids = set([subtype.id for subtype in fol_obj.subtype_ids]) + self.assertEqual(set(fol_subtype_ids), set(default_group_subtypes), 'subscription subtypes are incorrect') - # Unsubscribe Raoul twice through message_unsubscribe_users + # Do: Unsubscribe Raoul twice through message_unsubscribe_users group_pigs.message_unsubscribe_users([user_raoul_id, user_raoul_id]) group_pigs.refresh() + # Test: 1 follower (Admin) follower_ids = [follower.id for follower in group_pigs.message_follower_ids] self.assertEqual(follower_ids, [user_admin.partner_id.id], 'Admin must be the only Pigs fan') + # Do: subscribe Admin with subtype_ids + group_pigs.message_subscribe_users([uid], [mt_mg_nodef, mt_all_nodef]) + fol_ids = self.mail_followers.search(cr, uid, [('res_model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id), ('partner_id', '=', user_admin.partner_id.id)]) + fol_obj = self.mail_followers.browse(cr, uid, fol_ids)[0] + fol_subtype_ids = set([subtype.id for subtype in fol_obj.subtype_ids]) + self.assertEqual(set(fol_subtype_ids), set([mt_mg_nodef, mt_all_nodef]), 'subscription subtypes are incorrect') + + # ---------------------------------------- + # CASE2: test mail_thread fields + # ---------------------------------------- + + group_pigs.refresh() + self.assertEqual(set(group_pigs.message_subtype_data.keys()), set(['comment', 'mt_mg_def', 'mt_all_def', 'mt_mg_nodef', 'mt_all_nodef']), 'mail.group available subtypes incorrect') + self.assertFalse(group_pigs.message_subtype_data['comment']['followed'], 'Admin should not follow comments in pigs') + self.assertTrue(group_pigs.message_subtype_data['mt_mg_nodef']['followed'], 'Admin should follow mt_mg_nodef in pigs') + self.assertTrue(group_pigs.message_subtype_data['mt_all_nodef']['followed'], 'Admin should follow mt_all_nodef in pigs') + def test_20_message_post(self): """ Tests designed for message_post. """ cr, uid = self.cr, self.uid @@ -283,8 +320,6 @@ class test_mail(TestMailMockups): user_admin = self.res_users.browse(cr, uid, uid) group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id) - # 0 - Admin - p_a_id = user_admin.partner_id.id # 1 - Bert Tartopoils, with email, should receive emails for comments and emails p_b_id = self.res_partner.create(cr, uid, {'name': 'Bert Tartopoils', 'email': 'b@b'}) # 2 - Carine Poilvache, with email, should never receive emails @@ -306,9 +341,12 @@ class test_mail(TestMailMockups): _mail_bodyalt2 = 'Pigs rules\nAdmin' _attachments = [('First', 'My first attachment'), ('Second', 'My second attachment')] + # ---------------------------------------- # CASE1: post comment, body and subject specified + # ---------------------------------------- + self._init_mock_build_email() - msg_id = self.mail_group.message_post(cr, uid, self.group_pigs_id, body=_body1, subject=_subject, type='comment') + msg_id = self.mail_group.message_post(cr, uid, self.group_pigs_id, body=_body1, subject=_subject, type='comment', subtype='mt_comment') message = self.mail_message.browse(cr, uid, msg_id) sent_emails = self._build_email_kwargs_list # Test: notifications have been deleted @@ -325,7 +363,7 @@ class test_mail(TestMailMockups): self.assertIn(sent_email['body_alternative'], _mail_bodyalt1 + '\nBert Tartopoils\n', 'sent_email body_alternative is incorrect') # Test: mail_message: partner_ids = group followers message_pids = set([partner.id for partner in message.partner_ids]) - test_pids = set([p_a_id, p_b_id, p_c_id]) + test_pids = set([p_b_id, p_c_id]) self.assertEqual(test_pids, message_pids, 'mail.message partners incorrect') # Test: notification linked to this message = group followers = partner_ids notif_ids = self.mail_notification.search(cr, uid, [('message_id', '=', message.id)]) @@ -335,10 +373,13 @@ class test_mail(TestMailMockups): for sent_email in sent_emails: self.assertEqual(sent_email['email_to'], ['b@b'], 'sent_email email_to is incorrect') + # ---------------------------------------- # CASE2: post an email with attachments, parent_id, partner_ids + # ---------------------------------------- + # TESTS: automatic subject, signature in body_html, attachments propagation self._init_mock_build_email() - msg_id2 = self.mail_group.message_post(cr, uid, self.group_pigs_id, body=_body2, type='email', + msg_id2 = self.mail_group.message_post(cr, uid, self.group_pigs_id, body=_body2, type='email', subtype='mt_comment', partner_ids=[(6, 0, [p_d_id])], parent_id=msg_id, attachments=_attachments) message = self.mail_message.browse(cr, uid, msg_id2) sent_emails = self._build_email_kwargs_list @@ -356,7 +397,7 @@ class test_mail(TestMailMockups): self.assertIn(_mail_bodyalt2, sent_email['body_alternative'], 'sent_email body_alternative incorrect') # Test: mail_message: partner_ids = group followers message_pids = set([partner.id for partner in message.partner_ids]) - test_pids = set([p_a_id, p_b_id, p_c_id, p_d_id]) + test_pids = set([p_b_id, p_c_id, p_d_id]) self.assertEqual(message_pids, test_pids, 'mail.message partners incorrect') # Test: notifications linked to this message = group followers = partner_ids notif_ids = self.mail_notification.search(cr, uid, [('message_id', '=', message.id)]) @@ -394,8 +435,6 @@ class test_mail(TestMailMockups): _attachments_test = [('first.txt', 'My first attachment'), ('second.txt', 'My second attachment')] # Create partners - # 0 - Admin - p_a_id = user_admin.partner_id.id # 1 - Bert Tartopoils, with email, should receive emails for comments and emails p_b_id = self.res_partner.create(cr, uid, {'name': 'Bert Tartopoils', 'email': 'b@b'}) # 2 - Carine Poilvache, with email, should never receive emails @@ -429,9 +468,10 @@ class test_mail(TestMailMockups): self.assertEqual(message.body, _msg_body, 'mail.message incorrect body') # Test: mail.message: partner_ids = entries in mail.notification: group_pigs fans (a, b) + mail.compose.message partner_ids (c, d) msg_pids = [partner.id for partner in message.partner_ids] - test_pids = [p_a_id, p_b_id, p_c_id, p_d_id] + test_pids = [p_b_id, p_c_id, p_d_id] notif_ids = self.mail_notification.search(cr, uid, [('message_id', '=', message.id)]) - self.assertEqual(len(notif_ids), 4, 'mail.message: too much notifications created') + + self.assertEqual(len(notif_ids), 3, 'mail.message: too much notifications created') self.assertEqual(set(msg_pids), set(test_pids), 'mail.message partner_ids incorrect') # ---------------------------------------- @@ -449,22 +489,15 @@ class test_mail(TestMailMockups): self.assertEqual(compose.res_id, self.group_pigs_id, 'mail.compose.message incorrect res_id') self.assertEqual(compose.parent_id.id, message.id, 'mail.compose.message incorrect parent_id') self.assertEqual(compose.content_subtype, 'html', 'mail.compose.message incorrect content_subtype') - - # 2. Post the comment, get created message - parent_id = message.id - mail_compose.send_mail(cr, uid, [compose_id]) - group_pigs.refresh() - message = group_pigs.message_ids[0] # Test: mail.message: subject as Re:.., body in html, parent_id - self.assertEqual(message.subject, _msg_reply, 'mail.message incorrect subject') - self.assertIn('Administrator wrote:+
+ ++ + Pigs rules
', compose.body, 'mail.message body is incorrect') + self.assertEqual(compose.parent_id and compose.parent_id.id, message.id, 'mail.message parent_id incorrect') # Test: mail.message: attachments - for attach in message.attachment_ids: + for attach in compose.attachment_ids: self.assertEqual(attach.res_model, 'mail.group', 'mail.message attachment res_model incorrect') self.assertEqual(attach.res_id, self.group_pigs_id, 'mail.message attachment res_id incorrect') - self.assertIn((attach.name, attach.datas.decode('base64')), _attachments_test, - 'mail.message attachment name / data incorrect') + self.assertIn((attach.datas_fname, attach.datas.decode('base64')), _attachments_test, 'mail.message attachment name / data incorrect') # ---------------------------------------- # CASE3: mass_mail on Pigs and Bird @@ -472,8 +505,8 @@ class test_mail(TestMailMockups): # 1. mass_mail on pigs and bird compose_id = mail_compose.create(cr, uid, - {'subject': _subject, 'body': '${object.description}'}, - {'default_composition_mode': 'mass_mail', 'default_model': 'mail.group', 'default_res_id': -1, + {'subject': _subject, 'body': '${object.description}', 'content_type': 'html'}, + {'default_composition_mode': 'mass_mail', 'default_model': 'mail.group', 'default_res_id': False, 'active_ids': [self.group_pigs_id, group_bird_id]}) compose = mail_compose.browse(cr, uid, compose_id) # Test: content_subtype is html @@ -496,107 +529,114 @@ class test_mail(TestMailMockups): self.assertEqual(message2.subject, _subject, 'mail.message subject incorrect') self.assertEqual(message2.body, group_bird.description, 'mail.message body incorrect') - def test_30_message_read(self): - """ Tests designed for message_read. """ - # TDE NOTE: this test is not finished, as the message_read method is not fully specified. - # It will be updated as soon as we have fixed specs ! - cr, uid = self.cr, self.uid - group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id) + # FP Note: to be reviewed to be more generic, not depending on the algorythm of + # message_read + #def test_30_message_read(self): + # """ Tests designed for message_read. """ + # # TDE NOTE: this test is not finished, as the message_read method is not fully specified. + # # It will be updated as soon as we have fixed specs ! + # cr, uid = self.cr, self.uid + # group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id) - def _compare_structures(struct1, struct2, n=0): - # print '%scompare structure' % ('\t' * n) - self.assertEqual(len(struct1), len(struct2), 'message_read structure number of childs incorrect') - for x in range(len(struct1)): - # print '%s' % ('\t' * n), struct1[x]['id'], struct2[x]['id'], struct1[x].get('subject') or '' - self.assertEqual(struct1[x]['id'], struct2[x]['id'], 'message_read failure %s' % struct1[x].get('subject')) - _compare_structures(struct1[x]['child_ids'], struct2[x]['child_ids'], n + 1) - # print '%send compare' % ('\t' * n) + # def _compare_structures(struct1, struct2, n=0): + # # print '%scompare structure' % ('\t' * n) + # # self.assertEqual(len(struct1), len(struct2), 'message_read structure number of childs incorrect') - # ---------------------------------------- - # CASE1: Flattening test - # ---------------------------------------- + # for x in range(len(struct1)): + # if struct1[x].get('type') == 'expandable': + # continue + # # print '%s' % ('\t' * n), struct1[x]['id'], struct1[x]['child_nbr'], struct2[x]['id'], struct2[x].get('child_nbr', 'XX'), struct1[x].get('subject') or '' + # self.assertEqual(struct1[x]['id'], struct2[x]['id'], 'message_read failure %s' % struct1[x].get('subject')) + # _compare_structures(struct1[x]['child_ids'], struct2[x]['child_ids'], n + 1) + # # print '%send compare' % ('\t' * n) - # Create dummy message structure - import copy - tree = [{'id': 2, 'child_ids': [ - {'id': 6, 'child_ids': [ - {'id': 8, 'child_ids': []}, - ]}, - ]}, - {'id': 1, 'child_ids':[ - {'id': 7, 'child_ids': [ - {'id': 9, 'child_ids': []}, - ]}, - {'id': 4, 'child_ids': [ - {'id': 10, 'child_ids': []}, - {'id': 5, 'child_ids': []}, - ]}, - {'id': 3, 'child_ids': []}, - ]}, - ] - # Test: completely flat - new_tree = self.mail_message.message_read_tree_flatten(cr, uid, copy.deepcopy(tree), 0, 0) - self.assertEqual(len(new_tree), 10, 'message_read_tree_flatten wrong in flat') - # Test: 1 thread level - tree_test = [{'id': 2, 'child_ids': [ - {'id': 8, 'child_ids': []}, {'id': 6, 'child_ids': []}, - ]}, - {'id': 1, 'child_ids': [ - {'id': 10, 'child_ids': []}, {'id': 9, 'child_ids': []}, - {'id': 7, 'child_ids': []}, {'id': 5, 'child_ids': []}, - {'id': 4, 'child_ids': []}, {'id': 3, 'child_ids': []}, - ]}, - ] - new_tree = self.mail_message.message_read_tree_flatten(cr, uid, copy.deepcopy(tree), 0, 1) - _compare_structures(new_tree, tree_test) - # Test: 2 thread levels - new_tree = self.mail_message.message_read_tree_flatten(cr, uid, copy.deepcopy(tree), 0, 2) - _compare_structures(new_tree, tree) + # # ---------------------------------------- + # # CASE1: Flattening test + # # ---------------------------------------- - # ---------------------------------------- - # CASE2: message_read test - # ---------------------------------------- + # # Create dummy message structure + # import copy + # tree = [{'id': 2, 'child_nbr': 1, 'child_ids': [ + # {'id': 6, 'child_nbr': 1, 'child_ids': [ + # {'id': 8, 'child_nbr': 0, 'child_ids': []}, + # ]}, + # ]}, + # {'id': 1, 'child_nbr': 3, 'child_ids':[ + # {'id': 7, 'child_nbr': 1, 'child_ids': [ + # {'id': 9, 'child_nbr': 0, 'child_ids': []}, + # ]}, + # {'id': 4, 'child_nbr': 2, 'child_ids': [ + # {'id': 10, 'child_nbr': 0, 'child_ids': []}, + # {'id': 5, 'child_nbr': 0, 'child_ids': []}, + # ]}, + # {'id': 3, 'child_nbr': 0, 'child_ids': []}, + # ]}, + # ] + # # Test: completely flat + # new_tree = self.mail_message.message_read_tree_flatten(cr, uid, None, copy.deepcopy(tree), [('type', 'in', 'borderlands')], 0, limit=15, add_expandable=False) + # _compare_structures(new_tree, new_tree) + # self.assertEqual(len(new_tree), 10, 'message_read_tree_flatten wrong in flat') + # # Test: 1 thread level + # tree_test = [{'id': 2, 'child_ids': [ + # {'id': 8, 'child_ids': []}, {'id': 6, 'child_ids': []}, + # ]}, + # {'id': 1, 'child_ids': [ + # {'id': 10, 'child_ids': []}, {'id': 9, 'child_ids': []}, + # {'id': 7, 'child_ids': []}, {'id': 5, 'child_ids': []}, + # {'id': 4, 'child_ids': []}, {'id': 3, 'child_ids': []}, + # ]}, + # ] + # new_tree = self.mail_message.message_read_tree_flatten(cr, uid, None, copy.deepcopy(tree), [('type', 'in', 'borderlands')], 1, limit=15, add_expandable=False) + # _compare_structures(new_tree, tree_test) + # # Test: 2 thread levels + # new_tree = self.mail_message.message_read_tree_flatten(cr, uid, None, copy.deepcopy(tree), [('type', 'in', 'borderlands')], 2, limit=15, add_expandable=False) + # _compare_structures(new_tree, tree) - # 1. Add a few messages to pigs group - msgid1 = group_pigs.message_post(body='1', subject='1', parent_id=False) - msgid2 = group_pigs.message_post(body='2', subject='1-1', parent_id=msgid1) - msgid3 = group_pigs.message_post(body='3', subject='1-2', parent_id=msgid1) - msgid4 = group_pigs.message_post(body='4', subject='2', parent_id=False) - msgid5 = group_pigs.message_post(body='5', subject='1-1-1', parent_id=msgid2) - msgid6 = group_pigs.message_post(body='6', subject='2-1', parent_id=msgid4) + # # ---------------------------------------- + # # CASE2: message_read test + # # ---------------------------------------- - # Test: read all messages flat - tree_test = [{'id': msgid6, 'child_ids': []}, {'id': msgid5, 'child_ids': []}, - {'id': msgid4, 'child_ids': []}, {'id': msgid3, 'child_ids': []}, - {'id': msgid2, 'child_ids': []}, {'id': msgid1, 'child_ids': []}] - tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], thread_level=0, limit=10) - _compare_structures(tree, tree_test) - # Test: read with 1 level of thread - tree_test = [{'id': msgid4, 'child_ids': [{'id': msgid6, 'child_ids': []}, ]}, - {'id': msgid1, 'child_ids': [ - {'id': msgid5, 'child_ids': []}, {'id': msgid3, 'child_ids': []}, - {'id': msgid2, 'child_ids': []}, - ]}, - ] - tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], thread_level=1, limit=10) - _compare_structures(tree, tree_test) - # Test: read with 2 levels of thread - tree_test = [{'id': msgid4, 'child_ids': [{'id': msgid6, 'child_ids': []}, ]}, - {'id': msgid1, 'child_ids': [ - {'id': msgid3, 'child_ids': []}, - {'id': msgid2, 'child_ids': [{'id': msgid5, 'child_ids': []}, ]}, - ]}, - ] - tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], thread_level=2, limit=10) - _compare_structures(tree, tree_test) + # # 1. Add a few messages to pigs group + # msgid1 = group_pigs.message_post(body='1', subject='1', parent_id=False) + # msgid2 = group_pigs.message_post(body='2', subject='1-1', parent_id=msgid1) + # msgid3 = group_pigs.message_post(body='3', subject='1-2', parent_id=msgid1) + # msgid4 = group_pigs.message_post(body='4', subject='2', parent_id=False) + # msgid5 = group_pigs.message_post(body='5', subject='1-1-1', parent_id=msgid2) + # msgid6 = group_pigs.message_post(body='6', subject='2-1', parent_id=msgid4) - # 2. Test expandables - # TDE FIXME: add those tests when expandables are specified and implemented + # # Test: read all messages flat + # tree_test = [{'id': msgid6, 'child_ids': []}, {'id': msgid5, 'child_ids': []}, + # {'id': msgid4, 'child_ids': []}, {'id': msgid3, 'child_ids': []}, + # {'id': msgid2, 'child_ids': []}, {'id': msgid1, 'child_ids': []}] + # tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], level=0, limit=15) + # _compare_structures(tree, tree_test) + # # Test: read with 1 level of thread + # tree_test = [{'id': msgid4, 'child_ids': [{'id': msgid6, 'child_ids': []}, ]}, + # {'id': msgid1, 'child_ids': [ + # {'id': msgid5, 'child_ids': []}, {'id': msgid3, 'child_ids': []}, + # {'id': msgid2, 'child_ids': []}, + # ]}, + # ] + # tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], level=1, limit=15) + # _compare_structures(tree, tree_test) + # # Test: read with 2 levels of thread + # tree_test = [{'id': msgid4, 'child_ids': [{'id': msgid6, 'child_ids': []}, ]}, + # {'id': msgid1, 'child_ids': [ + # {'id': msgid3, 'child_ids': []}, + # {'id': msgid2, 'child_ids': [{'id': msgid5, 'child_ids': []}, ]}, + # ]}, + # ] + # tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], level=2, limit=15) + # _compare_structures(tree, tree_test) + + # # 2. Test expandables + # # TDE FIXME: add those tests when expandables are specified and implemented def test_40_needaction(self): """ Tests for mail.message needaction. """ cr, uid = self.cr, self.uid group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id) + group_pigs_demo = self.mail_group.browse(cr, self.user_demo, self.group_pigs_id) user_admin = self.res_users.browse(cr, uid, uid) # Demo values: check unread notification = needaction on mail.message @@ -607,9 +647,12 @@ class test_mail(TestMailMockups): na_count = self.mail_message._needaction_count(cr, uid, domain=[]) self.assertEqual(len(notif_ids), na_count, 'unread notifications count does not match needaction count') - # Post 4 message on group_pigs - for dummy in range(4): - group_pigs.message_post(body='My Body') + na_count1 = self.mail_message._needaction_count(cr, uid, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)]) + # Post 2 message on group_pigs as admin, 3 messages as demo user + for dummy in range(2): + group_pigs.message_post(body='My Body', subtype='mt_comment') + for dummy in range(3): + group_pigs_demo.message_post(body='My Demo Body', subtype='mt_comment') # Check there are 4 new needaction on mail.message notif_ids = self.mail_notification.search(cr, uid, [ @@ -621,7 +664,19 @@ class test_mail(TestMailMockups): # Check there are 4 needaction on mail.message with particular domain na_count = self.mail_message._needaction_count(cr, uid, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)]) - self.assertEqual(na_count, 4, 'posted message count does not match needaction count') + notif_ids = self.mail_notification.search(cr, uid, [ + ('partner_id', '=', user_admin.partner_id.id), + ('read', '=', False), + ('message_id.model','=','mail.group'), + ('message_id.res_id','=',self.group_pigs_id) + ]) + self.assertEqual(len(notif_ids), na_count, 'posted message count does not match needaction count') + + na_count3 = self.mail_message._needaction_count(cr, self.user_demo, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)]) + self.assertEqual(na_count3-na_count1, 0, 'demo has 0 message: not a follower and do not follow his own messages') + + na_count2 = self.mail_message._needaction_count(cr, uid, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)]) + self.assertEqual(na_count2-na_count1, 3, 'admin has 3 messages: 0 from itself as they are marked as read, 3 from demo') def test_50_thread_parent_resolution(self): """Verify parent/child relationships are correctly established when processing incoming mails""" @@ -636,15 +691,18 @@ class test_mail(TestMailMockups): # 1. In-Reply-To header reply_msg = MAIL_TEMPLATE.format(to='Pretty PigsPigs rules
] + model passed to message+process -> only attached to group, not to mail reply_msg3 = MAIL_TEMPLATE.format(to='Pretty Pigs %s
' % tools.ustr(wizard.body_text or '') + # wizard works in batch mode: [res_id] or active_ids res_ids = active_ids if mass_mail_mode and wizard.model and active_ids else [wizard.res_id] for res_id in res_ids: # default values, according to the wizard options post_values = { 'subject': wizard.subject if wizard.content_subtype == 'html' else False, - 'body': wizard.body if wizard.content_subtype == 'html' else '%s
' % tools.ustr(wizard.body_text), + 'body': body, 'parent_id': wizard.parent_id and wizard.parent_id.id, 'partner_ids': [(4, partner.id) for partner in wizard.partner_ids], 'attachments': [(attach.datas_fname or attach.name, base64.b64decode(attach.datas)) for attach in wizard.attachment_ids], @@ -245,11 +255,13 @@ class mail_compose_message(osv.TransientModel): post_values['attachments'] += new_attachments post_values.update(email_dict) # post the message - active_model_pool.message_post(cr, uid, [res_id], type='comment', context=context, **post_values) - # post process: update attachments, because id is not necessarily known when adding attachments in Chatter - self.pool.get('ir.attachment').write(cr, uid, [attach.id for attach in wizard.attachment_ids], {'res_id': wizard.id}, context=context) + id=active_model_pool.message_post(cr, uid, [res_id], type='comment', subtype='mt_comment', context=context, **post_values) - return {'type': 'ir.actions.act_window_close'} + # post process: update attachments, because id is not necessarily known when adding attachments in Chatter + # self.pool.get('ir.attachment').write(cr, uid, [attach.id for attach in wizard.attachment_ids], { + # 'res_id': wizard.id, 'res_model': wizard.model or False}, context=context) + + return {'type': 'ir.actions.act_window_close', 'res_model':'mail.compose.message', 'id': id} def render_message(self, cr, uid, wizard, res_id, context=None): """ Generate an email from the template for given (wizard.model, res_id) diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml index 2899c0c9a41..0f384dc5a0d 100644 --- a/addons/mail/wizard/mail_compose_message_view.xml +++ b/addons/mail/wizard/mail_compose_message_view.xml @@ -75,7 +75,7 @@-
+
- -
-
-
-
-
+
+