[ADD] mass_mailing: added bounce exchange banner

3 files changed, 28 insertions, 0 deletions

diff --git a/addons/mass_mailing/controllers/__init__.py b/addons/mass_mailing/controllers/__init__.py
index 8ee9bae18d9..fa333707c98 100644
--- a/addons/mass_mailing/controllers/__init__.py
+++ b/addons/mass_mailing/controllers/__init__.py
@@ -1 +1,4 @@
+# -*- coding: utf-8 -*-
+
 import main
+import website
diff --git a/addons/mass_mailing/controllers/main.py b/addons/mass_mailing/controllers/main.py
index 08d0bc37db4..d1e3b5a7657 100644
--- a/addons/mass_mailing/controllers/main.py
+++ b/addons/mass_mailing/controllers/main.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 
 import werkzeug
 
@@ -75,3 +76,13 @@ class MassMailController(http.Controller):
         cr, uid, context = request.cr, request.uid, request.context
         request.registry['website.links.click'].add_click(cr, uid, code, request.httprequest.remote_addr, request.session['geoip'].get('country_code'), stat_id=stat_id, context=context)
         return werkzeug.utils.redirect(request.registry['website.links'].get_url_from_code(cr, uid, code, context=context), 301)
+
+    @http.route(['/website_mass_mailing/get_content'], type='json', auth="public", website=True)
+    def get_mass_mailing_content(self, newsletter_id, **post):
+        data = self.is_subscriber(newsletter_id, **post)
+        mass_mailing_list = request.registry['mail.mass_mailing.list'].browse(request.cr, SUPERUSER_ID, int(newsletter_id), request.context)
+        data.update({
+            'content': mass_mailing_list.popup_content,
+            'redirect_url': mass_mailing_list.popup_redirect_url
+            })
+        return data
diff --git a/addons/mass_mailing/controllers/website.py b/addons/mass_mailing/controllers/website.py
new file mode 100644
index 00000000000..4222128535b
--- /dev/null
+++ b/addons/mass_mailing/controllers/website.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+
+from openerp import http
+from openerp.addons.website.controllers.main import Website
+
+
+class Website(Website):
+
+    @http.route(["/website_mass_mailing/field/popup_content"], type='http', auth="public", website=True)
+    def FieldTextHtmlPopupTemplate(self, model=None, res_id=None, field=None, callback=None, **kwargs):
+        kwargs['snippets'] = 'snippets' not in kwargs and '/website/snippets' or kwargs['snippets']
+        kwargs['dont_load_assets'] = False
+        kwargs['template'] = "mass_mailing.FieldTextHtmlPopupContent"
+        return self.FieldTextHtml(model, res_id, field, callback, **kwargs)