From d993e47c007e7e1ee363d6f81e5e6999741b3dff Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Fri, 31 Aug 2012 14:12:35 +0530
Subject: [PATCH] [IMP]if subtype not selected should not b show in wall

bzr revid: sgo@tinyerp.com-20120831084235-0pbgui7w4d62c4ip
---
 addons/mail/mail_message.py                   | 29 ++++++++-----------
 addons/mail/static/src/xml/mail_followers.xml |  2 +-
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 563e6d2ef6f..c0ae16dc503 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -323,37 +323,32 @@ class mail_message(osv.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.check(cr, uid, [newid], mode='create', context=context)
-        self.notify(cr, uid, newid, values.get('subtype_id',False), context=context)
+        self.notify(cr, uid, newid, context=context)
         return newid
 
-    def notify(self, cr, uid, newid,subtype_id=None, 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
         """
-        followers_obj = self.pool.get('mail.followers')
+        followers_obj = self.pool.get("mail.followers")
         message = self.browse(cr, uid, newid, context=context)
-        followers_ids = followers_obj.search(cr, uid, ['&', ('res_model', '=', message.model), ('res_id', 'in', [message.res_id])], context=context)
-        # check with subtype
-        is_subtype = False
-       
-        for subscription in followers_obj.browse(cr, uid, followers_ids, context=context):
-            if subtype_id:
-                if subtype_id in [subtype.id for subtype in subscription.subtype_ids]:
-                    is_subtype = True
         partners_to_notify = set([])
         # add all partner_ids of the message
         if message.partner_ids:
-            if(is_subtype):
-                partners_to_notify |= set(partner.id for partner in 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
         if message.model and message.res_id:
             record = self.pool.get(message.model).browse(cr, uid, message.res_id, context=context)
             extra_notified = set(partner.id for partner in record.message_follower_ids)
             missing_notified = extra_notified - partners_to_notify
-            if missing_notified:
-                message.write({'partner_ids': [(4, p_id) for p_id in missing_notified]})
-            if(is_subtype):
-                partners_to_notify |= extra_notified
+            missing_follow_ids = []
+            if message.subtype_id:
+                for p_id in missing_notified:
+                    follow_ids = followers_obj.search(cr, uid, [('partner_id','=',p_id),('subtype_ids','in',[message.subtype_id.id]),('res_model','=',message.model),('res_id','=',message.res_id)])
+                    if follow_ids and len(follow_ids):
+                        missing_follow_ids.append(p_id)
+            message.write({'partner_ids': [(4, p_id) for p_id in missing_follow_ids]})
+            partners_to_notify |= extra_notified
         self.pool.get('mail.notification').notify(cr, uid, list(partners_to_notify), newid, context=context)
 
     def read(self, cr, uid, ids, fields_to_read=None, context=None, load='_classic_read'):
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 6960e2a3b5f..66173dd47ee 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -10,11 +10,11 @@
             <button type="button" class="oe_mail_button_follow oe_mail_button_mouseout">Not following</button>
             <button type="button" class="oe_mail_button_unfollow oe_mail_button_mouseout">Following</button>
         </div>
+        <ul class="oe_mail_recthread_subtype"></ul>
         <div class="oe_mail_recthread_followers">
             <t t-if="widget.options.title">
                 <h4><t t-raw="widget.options.title"/></h4>
             </t>
-            <ul class="oe_mail_recthread_subtype"></ul>
             <ul class="oe_mail_followers_display"></ul>
         </div>
     </div>