[IMP] add generic method _subscribe_followers_subtype in mail_thread & remove method in all module

bzr revid: fka@tinyerp.com-20121217073817-8kmp0j3kn39gyrwg

1 files changed, 5 insertions, 29 deletions

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 4d20f53c213..3255898999b 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -366,31 +366,6 @@ class project_issue(base_stage, osv.osv):
         return super(project_issue, self).copy(cr, uid, id, default=default,
                 context=context)
 
-    def _subscribe_project_followers_to_issue(self, cr, uid, task_id, context=None):
-        """ TDE note: not the best way to do this, we could override _get_followers
-            of issue, and perform a better mapping of subtypes than a mapping
-            based on names.
-            However we will keep this implementation, maybe to be refactored
-            in 7.1 of future versions. """
-        # task followers are project followers, with matching subtypes
-        task_record = self.browse(cr, uid, task_id, context=context)
-        subtype_obj = self.pool.get('mail.message.subtype')
-        follower_obj = self.pool.get('mail.followers')
-        if task_record.project_id:
-            # create mapping
-            task_subtype_ids = subtype_obj.search(cr, uid, ['|', ('res_model', '=', False), ('res_model', '=', self._name)], context=context)
-            task_subtypes = subtype_obj.browse(cr, uid, task_subtype_ids, context=context)
-            # fetch subscriptions
-            follower_ids = follower_obj.search(cr, uid, [('res_model', '=', 'project.project'), ('res_id', '=', task_record.project_id.id)], context=context)
-            # copy followers
-            for follower in follower_obj.browse(cr, uid, follower_ids, context=context):
-                if not follower.subtype_ids:
-                    continue
-                project_subtype_names = [project_subtype.name for project_subtype in follower.subtype_ids]
-                task_subtype_ids = [task_subtype.id for task_subtype in task_subtypes if task_subtype.name in project_subtype_names]
-                self.message_subscribe(cr, uid, [task_id], [follower.partner_id.id],
-                    subtype_ids=task_subtype_ids, context=context)
-
     def write(self, cr, uid, ids, vals, context=None):
         #Update last action date every time the user change the stage, the state or send a new email
         logged_fields = ['stage_id', 'state', 'message_ids']
@@ -399,8 +374,7 @@ class project_issue(base_stage, osv.osv):
 
         # subscribe new project followers to the issue
         if vals.get('project_id'):
-            for id in ids:
-                self._subscribe_project_followers_to_issue(cr, uid, id, context=context)
+            self._subscribe_followers_subtype(cr, uid, ids, vals.get('project_id'), 'project.project', context=context)
 
         return super(project_issue, self).write(cr, uid, ids, vals, context)
     
@@ -420,8 +394,10 @@ class project_issue(base_stage, osv.osv):
     def create(self, cr, uid, vals, context=None):
         obj_id = super(project_issue, self).create(cr, uid, vals, context=context)
 
-        # subscribe project follower to the issue
-        self._subscribe_project_followers_to_issue(cr, uid, obj_id, context=context)
+        project_id = self.browse(cr, uid, obj_id, context=context).project_id
+        if project_id: 
+            # subscribe project follower to the issue
+            self._subscribe_followers_subtype(cr, uid, [obj_id], project_id, 'project.project', context=context)
         self.create_send_note(cr, uid, [obj_id], context=context)
 
         return obj_id