From e980e1c71509559cf52e08c3a76e50fbeb49b053 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 9 Sep 2013 09:50:31 +0200
Subject: [PATCH] [FIX] context merge

bzr revid: fme@openerp.com-20130909075031-rvwxjdc07zhq0m8u
---
 addons/website_event/controllers/main.py      |  8 ++++----
 addons/website_mail/controllers/main.py       |  8 ++++++--
 addons/website_membership/controllers/main.py |  4 +++-
 addons/website_sale/controllers/main.py       | 10 +++++++---
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index 783eda872b2..6bdac7c14ec 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -124,11 +124,11 @@ class website_event(http.Controller):
     @website.route(['/event/<int:event_id>'], type='http', auth="public")
     def event(self, event_id=None, **post):
         event_obj = request.registry['event.event']
+        context = request.context.copy()
+        context.update({'show_address': 1})
         values = {
-            'event_id': event_obj.browse(request.cr, request.uid, event_id,
-                                         dict({'show_address': 1} + request.context)),
-            'message_ids': event_obj.browse(request.cr, request.uid, event_id,
-                                            context=request.context).message_ids,
+            'event_id': event_obj.browse(request.cr, request.uid, event_id, context),
+            'message_ids': event_obj.browse(request.cr, request.uid, event_id, request.context).message_ids,
             'subscribe': post.get('subscribe'),
             'range': range
         }
diff --git a/addons/website_mail/controllers/main.py b/addons/website_mail/controllers/main.py
index 32a93dfaf45..1efcecc9f3e 100644
--- a/addons/website_mail/controllers/main.py
+++ b/addons/website_mail/controllers/main.py
@@ -71,13 +71,15 @@ class website_mail(http.Controller):
                 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:
+            context = request.context.copy()
+            context.update({'mail_create_nosubsrequest.cribe': True})
             request.registry['mail.group'].message_post(request.cr, request.uid, mail_group_id,
                     body=request.session.body,
                     parent_id=blog_id,
                     website_published=blog_id and True or False,
                     type='comment',
                     subtype='mt_comment',
-                    context=dict({'mail_create_nosubsrequest.cribe': True} + request.context))
+                    context=context)
             request.session.body = False
 
         if post.get('body'):
@@ -87,13 +89,15 @@ class website_mail(http.Controller):
 
     @website.route(['/blog/<int:mail_group_id>/new'], type='http', auth="public")
     def new_blog_post(self, mail_group_id=None, **post):
+        context = request.context.copy()
+        context.update({'mail_create_nosubsrequest.cribe': True})
         blog_id = request.registry['mail.group'].message_post(request.cr, request.uid, mail_group_id,
                 body=_("Blog content.<br/>Please edit this content then you can publish this blog."),
                 subject=_("Blog title"),
                 website_published=False,
                 type='comment',
                 subtype='mt_comment',
-                context=dict({'mail_create_nosubsrequest.cribe': True} + request.context))
+                context=context)
         return werkzeug.utils.redirect("/blog/%s/%s/" % (mail_group_id, blog_id))
 
     @website.route(['/blog/<int:mail_group_id>/subscribe', '/blog/<int:mail_group_id>/<int:blog_id>/subscribe'], type='http', auth="public")
diff --git a/addons/website_membership/controllers/main.py b/addons/website_membership/controllers/main.py
index eb8d6759b1a..612fa4e3b2f 100644
--- a/addons/website_membership/controllers/main.py
+++ b/addons/website_membership/controllers/main.py
@@ -64,9 +64,11 @@ class website_crm_partner_assign(http.Controller):
         if not request.webcontext.is_public_user:
             partner_ids += partner_obj.search(request.cr, request.uid, [('id', '=', ref_id)], context=request.context)
 
+        context = request.context.copy()
+        context.update({'show_address': True})
         values = {
             'partner_id': partner_obj.browse(
                 request.cr, openerp.SUPERUSER_ID, partner_ids[0],
-                context=dict({'show_address': True} + request.context)),
+                context=context),
         }
         return request.webcontext.render("website_membership.details", values)
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index ed466e26fb0..3d66cc88b17 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -30,9 +30,10 @@ def get_order(order_id=None):
         order = order_obj.browse(request.cr, SUPERUSER_ID, order_id, request.context)
         request.httprequest.session['ecommerce_order_id'] = order.id
 
-    context = dict({
+    context = request.context.copy()
+    context.update({
         'pricelist': order.pricelist_id.id,
-    } + request.context)
+    })
     return order_obj.browse(request.cr, SUPERUSER_ID, order_id, context=context)
 
 def get_current_order():
@@ -174,7 +175,10 @@ class Ecommerce(http.Controller):
         if not order:
             order = get_order()
 
-        context = dict({'pricelist': self.get_pricelist()} + request.context)
+        context = request.context.copy()
+        context.update({
+            'pricelist': self.get_pricelist()
+        })
 
         quantity = 0