Merge lp:~openerp-dev/openobject-addons/trunk-mail-notification-link-tde into lp:openobject-addons

[Thibault Delavallée (OpenERP)]

[IMP] mail: improved link in notification, now of form
Sent from <company> using <openerp:pub>, about <model document_name>, access in <customer portal:partner only>

=== modified file 'mail/mail_followers.py'
--- mail/mail_followers.py	2014-04-17 09:41:33 +0000
+++ mail/mail_followers.py	2014-04-23 11:17:32 +0000
@@ -109,8 +109,7 @@
                     Administrator
                 </p>
                 <div>
-                    <small>Sent by <a ...>Your Company</a> using <a ...>OpenERP</a>.</small> OR
-                    <small>Sent by Administrator using <a ...>OpenERP</a>.</small>
+                    <small>Sent from <a ...>Your Company</a> using <a ...>OpenERP</a>.</small>
                 </div>
         """
         footer = ""
@@ -132,7 +131,7 @@
             company = "<a style='color:inherit' href='%s'>%s</a>" % (website_url, user.company_id.name)
         else:
             company = user.company_id.name
-        sent_by = _('Sent by %(company)s using %(openerp)s.')
+        sent_by = _('Sent from %(company)s using %(openerp)s')
         signature_company = '<small>%s</small>' % (sent_by % {
             'company': company,
             'openerp': "<a style='color:inherit' href='https://www.openerp.com/'>OpenERP</a>"

=== modified file 'mail/mail_mail.py'
--- mail/mail_mail.py	2014-04-08 12:40:53 +0000
+++ mail/mail_mail.py	2014-04-23 11:17:32 +0000
@@ -145,8 +145,16 @@
     #------------------------------------------------------
 
     def _get_partner_access_link(self, cr, uid, mail, partner=None, context=None):
+<<<<<<< TREE
         """Generate URLs for links in mails: partner has access (is user):
         link to action_mail_redirect action that will redirect to doc or Inbox """
+=======
+        """ Generate URLs for links in mails:
+            - partner is an user and has read access to the document: direct link to document with model, res_id
+        """
+        if context is None:
+            context = {}
+>>>>>>> MERGE-SOURCE
         if partner and partner.user_ids:
             base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
             # the parameters to encode for the query and fragment part of url
@@ -159,9 +167,15 @@
                 fragment['message_id'] = mail.mail_message_id.id
             elif mail.model and mail.res_id:
                 fragment.update(model=mail.model, res_id=mail.res_id)
+<<<<<<< TREE
 
             url = urljoin(base_url, "/web?%s#%s" % (urlencode(query), urlencode(fragment)))
             return _("""<span class='oe_mail_footer_access'><small>Access your messages and documents <a style='color:inherit' href="%s">in OpenERP</a></small></span>""") % url
+=======
+
+            url = urljoin(base_url, "?%s#%s" % (urlencode(query), urlencode(fragment)))
+            return _("""<span class='oe_mail_footer_access'><small>about <a style='color:inherit' href="%s">%s %s</a></small></span>""") % (url, context.get('model_name', ''), mail.record_name)
+>>>>>>> MERGE-SOURCE
         else:
             return None
 
@@ -233,10 +247,23 @@
                 email sending process has failed
             :return: True
         """
+        if context is None:
+            context = {}
         ir_mail_server = self.pool.get('ir.mail_server')
+<<<<<<< TREE
 
+=======
+>>>>>>> MERGE-SOURCE
         for mail in self.browse(cr, SUPERUSER_ID, ids, context=context):
             try:
+                # TDE note: remove me when model_id field is present on mail.message - done here to avoid doing it multiple times in the sub method
+                if mail.model:
+                    model_id = self.pool['ir.model'].search(cr, SUPERUSER_ID, [('model', '=', mail.model)], context=context)[0]
+                    model = self.pool['ir.model'].browse(cr, SUPERUSER_ID, model_id, context=context)
+                else:
+                    model = None
+                if model:
+                    context['model_name'] = model.name
                 # handle attachments
                 attachments = []
                 for attach in mail.attachment_ids:

=== modified file 'portal/mail_mail.py'
--- portal/mail_mail.py	2014-03-11 20:53:37 +0000
+++ portal/mail_mail.py	2014-04-23 11:17:32 +0000
@@ -39,8 +39,14 @@
         if partner and not partner.user_ids:
             contex_signup = dict(context, signup_valid=True)
             signup_url = partner_obj._get_signup_url_for_action(cr, SUPERUSER_ID, [partner.id],
+<<<<<<< TREE
                                                                     model=mail.model, res_id=mail.res_id,
                                                                     context=contex_signup)[partner.id]
             return _("""<span class='oe_mail_footer_access'><small>Access your messages and documents through <a style='color:inherit' href="%s">our Customer Portal</a></small></span>""") % signup_url
+=======
+                                                                action='login', model=mail.model, res_id=mail.res_id,
+                                                                context=contex_signup)[partner.id]
+            return _("""<span class='oe_mail_footer_access'><small>access %s %s through <a style='color:inherit' href="%s">our Customer Portal</a></small></span>""") % (context.get('model_name', ''), mail.record_name, signup_url)
+>>>>>>> MERGE-SOURCE
         else:
             return super(mail_mail, self)._get_partner_access_link(cr, uid, mail, partner=partner, context=context)