[IMP] Refactor code + WIP multiwebsite

bzr revid: fme@openerp.com-20130910134133-esdgbhbtt8eguapk

1 files changed, 8 insertions, 10 deletions

diff --git a/addons/website_mail/controllers/main.py b/addons/website_mail/controllers/main.py
index 3331be0042f..012ef9c10a8 100644
--- a/addons/website_mail/controllers/main.py
+++ b/addons/website_mail/controllers/main.py
@@ -17,7 +17,6 @@ class website_mail(http.Controller):
     @website.route(['/blog/', '/blog/<int:mail_group_id>/', '/blog/<int:mail_group_id>/<int:blog_id>/',
                 '/blog/page/<int:page>/', '/blog/<int:mail_group_id>/page/<int:page>/', '/blog/<int:mail_group_id>/<int:blog_id>/page/<int:page>/'], type='http', auth="public")
     def blog(self, mail_group_id=None, blog_id=None, page=0, **post):
-        website = request.registry['website']
         group_obj = request.registry['mail.group']
         message_obj = request.registry['mail.message']
         user_obj = request.registry['res.users']
@@ -28,10 +27,9 @@ class website_mail(http.Controller):
             'nav_list': dict(),
             'mail_group_id': mail_group_id,
             'subscribe': post.get('subscribe'),
-            'website': website,
         }
 
-        if not request.webcontext.is_public_user and mail_group_id:
+        if not request.context['is_public_user'] and mail_group_id:
             message_follower_ids = group_obj.read(request.cr, request.uid, [mail_group_id], ['message_follower_ids'], request.context)[0]['message_follower_ids']
             parent_id = user_obj.browse(request.cr, SUPERUSER_ID, request.uid, request.context).partner_id.id
             values['subscribe'] = parent_id in message_follower_ids
@@ -50,12 +48,12 @@ class website_mail(http.Controller):
         else:
             step = 20
             message_count = len(group_obj.get_public_message_ids(request.cr, request.uid, domain=domain, order="create_date desc", context=request.context))
-            pager = website.pager(url="/blog/%s/" % mail_group_id, total=message_count, page=page, step=step, scope=7)
+            pager = request.website.pager(url="/blog/%s/" % mail_group_id, total=message_count, page=page, step=step, scope=7)
             message_ids = group_obj.get_public_message_ids(request.cr, request.uid, domain=domain, order="create_date desc", limit=step, offset=pager['offset'], context=request.context)
             values['pager'] = pager
             values['blog_ids'] = message_obj.browse(request.cr, request.uid, message_ids, request.context)
 
-        return request.webcontext.render("website_mail.index", values)
+        return request.website.render("website_mail.index", values)
 
     @website.route(['/blog/nav'], type='http', auth="public")
     def nav(self, **post):
@@ -67,7 +65,7 @@ class website_mail(http.Controller):
         url = request.httprequest.host_url
         if post.get('body'):
             request.session.body = post.get('body')
-            if request.webcontext.is_public_user:
+            if request.context['is_public_user']:
                 return '%s/admin#action=redirect&url=%s/blog/%s/%s/post' % (url, url, mail_group_id, blog_id)
 
         if 'body' in request.session and request.session.body:
@@ -102,8 +100,8 @@ class website_mail(http.Controller):
         group_obj = request.registry['mail.group']
         user_obj = request.registry['res.users']
 
-        if mail_group_id and 'subscribe' in post and (post.get('email') or not request.webcontext.is_public_user):
-            if request.webcontext.is_public_user:
+        if mail_group_id and 'subscribe' in post and (post.get('email') or not request.context['is_public_user']):
+            if request.context['is_public_user']:
                 partner_ids = partner_obj.search(request.cr, SUPERUSER_ID, [("email", "=", post.get('email'))], context=request.context)
                 if not partner_ids:
                     partner_ids = [partner_obj.create(request.cr, SUPERUSER_ID, {"email": post.get('email'), "name": "Subscribe: %s" % post.get('email')}, request.context)]
@@ -120,8 +118,8 @@ class website_mail(http.Controller):
         group_obj = request.registry['mail.group']
         user_obj = request.registry['res.users']
 
-        if mail_group_id and 'unsubscribe' in post and (post.get('email') or not request.webcontext.is_public_user):
-            if request.webcontext.is_public_user:
+        if mail_group_id and 'unsubscribe' in post and (post.get('email') or not request.context['is_public_user']):
+            if request.context['is_public_user']:
                 partner_ids = partner_obj.search(request.cr, SUPERUSER_ID, [("email", "=", post.get('email'))], context=request.context)
             else:
                 partner_ids = [user_obj.browse(request.cr, request.uid, request.uid, request.context).partner_id.id]