[IMP] email_template: relocate url rewritign stuff directly into the rendering method.

bzr revid: tde@openerp.com-20140303104044-hgmii31ga6msf72z

3 files changed, 1 insertions, 86 deletions

diff --git a/addons/website_mail/models/__init__.py b/addons/website_mail/models/__init__.py
index 3e374ccddd2..fc2ecbbc9bb 100644
--- a/addons/website_mail/models/__init__.py
+++ b/addons/website_mail/models/__init__.py
@@ -1,4 +1,3 @@
 import mail_message
 import mail_thread
-import email_template
-import mail_compose_message
\ No newline at end of file
+import email_template
\ No newline at end of file
diff --git a/addons/website_mail/models/email_template.py b/addons/website_mail/models/email_template.py
index 105fcff4428..beb02739f29 100644
--- a/addons/website_mail/models/email_template.py
+++ b/addons/website_mail/models/email_template.py
@@ -19,9 +19,6 @@
 #
 ##############################################################################
 
-import lxml
-import urlparse
-
 from openerp.osv import osv, fields
 from openerp.tools.translate import _
 
@@ -39,50 +36,3 @@ class EmailTemplate(osv.Model):
             help='Link to the website',
         ),
     }
-
-    def _postprocess_html_replace_links(self, cr, uid, body_html, context=None):
-        """ Post-processing of body_html. Indeed the content generated by the
-        website builder contains references to local addresses, for example
-        for images. This method changes those addresses to absolute addresses. """
-        html = body_html
-        if not body_html:
-            return html
-
-        # form a tree
-        root = lxml.html.fromstring(html)
-        if not len(root) and root.text is None and root.tail is None:
-            html = '<div>%s</div>' % html
-            root = lxml.html.fromstring(html)
-
-        base_url = self.pool['ir.config_parameter'].get_param(cr, uid, 'web.base.url')
-        (base_scheme, base_netloc, bpath, bparams, bquery, bfragment) = urlparse.urlparse(base_url)
-
-        def _process_link(url):
-            new_url = url
-            (scheme, netloc, path, params, query, fragment) = urlparse.urlparse(url)
-            if not scheme and not netloc:
-                new_url = urlparse.urlunparse((base_scheme, base_netloc, path, params, query, fragment))
-            return new_url
-
-        # check all nodes, replace :
-        # - img src -> check URL
-        # - a href -> check URL
-        for node in root.iter():
-            if node.tag == 'a':
-                node.set('href', _process_link(node.get('href')))
-            elif node.tag == 'img' and not node.get('src', 'data').startswith('data'):
-                node.set('src', _process_link(node.get('src')))
-
-        html = lxml.html.tostring(root, pretty_print=False, method='html')
-        # this is ugly, but lxml/etree tostring want to put everything in a 'div' that breaks the editor -> remove that
-        if html.startswith('<div>') and html.endswith('</div>'):
-            html = html[5:-6]
-        return html
-
-    def generate_email_batch(self, cr, uid, template_id, res_ids, context=None, fields=None):
-        """ Add a post processing after rendering, aka replace local URLs to absolute URLs. """
-        results = super(EmailTemplate, self).generate_email_batch(cr, uid, template_id, res_ids, context=context, fields=fields)
-        for res_id, value in results.iteritems():
-            if 'body_html' in value:
-                results[res_id]['body_html'] = self._postprocess_html_replace_links(cr, uid, value['body_html'], context=context)
-        return results
diff --git a/addons/website_mail/models/mail_compose_message.py b/addons/website_mail/models/mail_compose_message.py
deleted file mode 100644
index bc8258bbb6f..00000000000
--- a/addons/website_mail/models/mail_compose_message.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2014-Today OpenERP SA (<http://www.openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from openerp.osv import osv
-
-
-class MailComposeMessage(osv.Model):
-    _inherit = 'mail.compose.message'
-
-    def generate_email_for_composer_batch(self, cr, uid, template_id, res_ids, context=None, fields=None):
-        """ Add a post processing after rendering, aka replace local URLs to absolute URLs. """
-        results = super(MailComposeMessage, self).generate_email_for_composer_batch(cr, uid, template_id, res_ids, context=context, fields=fields)
-        for res_id, value in results.iteritems():
-            if 'body' in value:
-                results[res_id]['body'] = self.pool['email.template']._postprocess_html_replace_links(cr, uid, value['body'], context=context)
-        return results