[IMP] mail: default recipients management

- mail.compose.message: in render_message_batch, compute defaults recipients
for the composer (method called for mass mailing only). This way values are
available for inheriting models.

bzr revid: tde@openerp.com-20140325135347-9v7u4uokffy7ud43

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index c5bec47..86dbe50 100644 (file)
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -662,18 +662,19 @@ class mail_thread(osv.AbstractModel):
     #------------------------------------------------------
 
     def message_get_default_recipients(self, cr, uid, ids, context=None):
-        res = dict.fromkeys(ids, False)
-        for record in self.browse(cr, uid, ids, context=context):
-            recipient_ids, email_to = list(), ''
-            if self._name == 'res.partner':
-                recipient_ids.append(record.id)
-            elif 'partner_id' in self._all_columns and record.partner_id:
-                recipient_ids.append(record.parent_id.id)
+        model = self
+        if context and context.get('thread_model'):
+            model = self.pool[context['thread_model']]
+        res = {}
+        for record in model.browse(cr, SUPERUSER_ID, ids, context=context):
+            recipient_ids, email_to, email_cc = set(), False, False
+            if 'partner_id' in self._all_columns and record.partner_id:
+                recipient_ids.add(record.parent_id.id)
             elif 'email_from' in self._all_columns and record.email_from:
                 email_to = record.email_from
             elif 'email' in self._all_columns:
                 email_to = record.email
-            res[record.id] = {'recipient_ids': recipient_ids, 'email_to': email_to}
+            res[record.id] = {'partner_ids': list(recipient_ids), 'email_to': email_to, 'email_cc': email_cc}
         return res
 
     def message_get_reply_to(self, cr, uid, ids, context=None):
@@ -681,10 +682,9 @@ class mail_thread(osv.AbstractModel):
             the alias of the document, if it exists. """
         if not self._inherits.get('mail.alias'):
             return [False for id in ids]
-        return ["%s@%s" % (record['alias_name'], record['alias_domain'])
-                    if record.get('alias_domain') and record.get('alias_name')
-                    else False
-                    for record in self.read(cr, SUPERUSER_ID, ids, ['alias_name', 'alias_domain'], context=context)]
+        return ["%s@%s" % (record.alias_name, record.alias_domain)
+                if record.alias_domain and record.alias_name else False
+                for record in self.browse(cr, SUPERUSER_ID, ids, context=context)]
 
     #------------------------------------------------------
     # Mail gateway

diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py
index 8da2441..9b0d01d 100644 (file)
--- a/addons/mail/res_partner.py
+++ b/addons/mail/res_partner.py
@@ -53,4 +53,5 @@ class res_partner_mail(osv.Model):
             self._message_add_suggested_recipient(cr, uid, recipients, partner, partner=partner, reason=_('Partner Profile'))
         return recipients
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+    def message_get_default_recipients(self, cr, uid, ids, context=None):
+        return dict((id, {'partner_ids': [id], 'email_to': False, 'email_cc': False}) for id in ids)

diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 43259d3..74f8d2f 100644 (file)
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -224,6 +224,7 @@ class mail_compose_message(osv.TransientModel):
             context = {}
         # import datetime
         # print '--> beginning sending email', datetime.datetime.now()
+
         # clean the context (hint: mass mailing sets some default values that
         # could be wrongly interpreted by mail_mail)
         context.pop('default_email_to', None)
@@ -277,10 +278,6 @@ class mail_compose_message(osv.TransientModel):
         if mass_mail_mode and wizard.model:
             rendered_values = self.render_message_batch(cr, uid, wizard, res_ids, context=context)
 
-        # # get default recipients for mass mailing
-        # if mass_mail_mode and hasattr(self.pool[wizard.model], 'message_get_default_recipients'):
-        #     default_recipients = self.pool[wizard.model].message_get_default_recipients(cr, uid, res_ids, context=context)
-
         for res_id in res_ids:
             # static wizard (mail.message) values
             mail_values = {
@@ -302,7 +299,6 @@ class mail_compose_message(osv.TransientModel):
                     mail_values['auto_delete'] = context.get('mail_auto_delete')
                 # rendered values using template
                 email_dict = rendered_values[res_id]
-                print email_dict
                 mail_values['partner_ids'] += email_dict.pop('partner_ids', [])
                 mail_values.update(email_dict)
                 if wizard.same_thread:
@@ -312,10 +308,6 @@ class mail_compose_message(osv.TransientModel):
                 # mail_mail values: body -> body_html, partner_ids -> recipient_ids
                 mail_values['body_html'] = mail_values.get('body', '')
                 mail_values['recipient_ids'] = [(4, id) for id in mail_values.pop('partner_ids', [])]
-                # add some specific recipients depending on the model, to be sure some are mailed
-                if default_recipients.get(res_id):
-                    mail_values['recipient_ids'] += [(4, id) for id in default_recipients[res_id]['recipient_ids']]
-                    mail_values['email_to'] = ','.join(filter(None, [mail_values.get('email_to', ''), default_recipients[res_id]['email_to']]))
 
                 # process attachments: should not be encoded before being processed by message_post / mail_mail create
                 mail_values['attachments'] = [(name, base64.b64decode(enc_cont)) for name, enc_cont in email_dict.pop('attachments', list())]
@@ -326,7 +318,7 @@ class mail_compose_message(osv.TransientModel):
                 mail_values['attachment_ids'] = self.pool['mail.thread']._message_preprocess_attachments(
                     cr, uid, mail_values.pop('attachments', []),
                     attachment_ids, 'mail.message', 0, context=context)
-                print mail_values
+
             results[res_id] = mail_values
         return results
 
@@ -343,6 +335,10 @@ class mail_compose_message(osv.TransientModel):
         once, and render it multiple times. This is useful for mass mailing where
         template rendering represent a significant part of the process.
 
+        Default recipients are also computed, based on mail_thread method
+        message_get_default_recipients. This allows to ensure a mass mailing has
+        always some recipients specified.
+
         :param browse wizard: current mail.compose.message browse record
         :param list res_ids: list of record ids
 
@@ -354,6 +350,14 @@ class mail_compose_message(osv.TransientModel):
         emails_from = self.render_template_batch(cr, uid, wizard.email_from, wizard.model, res_ids, context=context)
         replies_to = self.render_template_batch(cr, uid, wizard.reply_to, wizard.model, res_ids, context=context)
 
+        if wizard.model and hasattr(self.pool[wizard.model], 'message_get_default_recipients'):
+            default_recipients = self.pool[wizard.model].message_get_default_recipients(cr, uid, res_ids, context=context)
+        elif wizard.model:
+            ctx = dict(context, thread_model=wizard.model)
+            default_recipients = self.pool['mail.thread'].message_get_default_recipients(cr, uid, res_ids, context=ctx)
+        else:
+            default_recipients = {}
+
         results = dict.fromkeys(res_ids, False)
         for res_id in res_ids:
             results[res_id] = {
@@ -362,6 +366,7 @@ class mail_compose_message(osv.TransientModel):
                 'email_from': emails_from[res_id],
                 'reply_to': replies_to[res_id],
             }
+            results[res_id].update(default_recipients.get(res_id, dict()))
         return results
 
     def render_template_batch(self, cr, uid, template, model, res_ids, context=None, post_process=False):