bzr revid: fp@tinyerp.com-20120823155747-0ysezcil7hcy1sv0
This commit is contained in:
Fabien Pinckaers
2012-08-23 17:57:47 +02:00
parent d0d14766fc
commit 462fc03987
3 changed files with 8 additions and 3 deletions
+2
View File
@@ -83,6 +83,8 @@ class mail_notification(osv.Model):
'subject': msg.subject
}
for partner in partner_obj.browse(cr, uid, partner_ids, context=context):
if partner.user_id.id == uid:
continue
notification_obj.create(cr, uid, {
'partner_id': partner.id,
'message_id': msg_id
+1 -2
View File
@@ -264,8 +264,7 @@ class mail_message(osv.Model):
modobj = self.pool.get(values.get('model'))
follower_notify = []
for follower in modobj.browse(cr, uid, values.get('res_id'), context=context).message_follower_ids:
if follower.id <> uid:
follower_notify.append(follower.id)
follower_notify.append(follower.id)
self.pool.get('mail.notification').notify(cr, uid, follower_notify, newid, context=context)
return newid
+5 -1
View File
@@ -143,7 +143,7 @@ class mail_thread(osv.Model):
res[notif.message_id.res_id]['message_unread'] = True
for thread in self.browse(cr, uid, ids, context=context):
res[thread.id]['message_summary'] = "<span><span class='oe_e'>9</span> %d</span> <span><span class='oe_e'>+</span> %d</span>" % (len(thread.message_ids), len(thread.message_follower_ids))
res[thread.id]['message_summary'] = "<span><span class='oe_e'>9</span> %d</span> <span><span class='oe_e'>+</span> %d</span>" % (len(thread.message_comment_ids), len(thread.message_follower_ids))
res[thread.id]['message_is_follower'] = user.partner_id.id in [follower.id for follower in thread.message_follower_ids]
return res
@@ -166,6 +166,10 @@ class mail_thread(osv.Model):
'message_follower_ids': many2many_reference('res.partner',
'mail_followers', 'res_id', 'partner_id',
ref_col_name='res_model', string='Followers'),
'message_comment_ids': fields.one2many('mail.message', 'res_id',
domain=lambda self: [('model','=',self._name),('type','in',('comment','email'))],
string='Related Messages',
help="All messages related to the current document."),
'message_ids': fields.one2many('mail.message', 'res_id',
domain=lambda self: [('model','=',self._name)],
string='Related Messages',