[FIX] context set on wrong methods

bzr revid: fme@openerp.com-20130909100059-j7yhkfql3qxaz96b

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 102c7d7..3412d0a 100644 (file)
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -57,8 +57,7 @@ class Website(openerp.addons.web.controllers.main.Home):
         imd = request.registry['ir.model.data']
         view = request.registry['ir.ui.view']
         view_model, view_id = imd.get_object_reference(
-            request.cr, request.uid, 'website', 'default_page',
-            context=request.context)
+            request.cr, request.uid, 'website', 'default_page')
         newview_id = view.copy(
             request.cr, request.uid, view_id, context=request.context)
         newview = view.browse(
@@ -92,7 +91,7 @@ class Website(openerp.addons.web.controllers.main.Home):
         view = request.registry['ir.ui.view']
 
         view_model, view_option_id = imd.get_object_reference(
-            request.cr, request.uid, 'website', 'theme', context=request.context)
+            request.cr, request.uid, 'website', 'theme')
         views = view.search(
             request.cr, request.uid, [('inherit_id', '=', view_option_id)],
             context=request.context)
@@ -102,7 +101,7 @@ class Website(openerp.addons.web.controllers.main.Home):
         if theme_id:
             module, xml_id = theme_id.split('.')
             view_model, view_id = imd.get_object_reference(
-                request.cr, request.uid, module, xml_id, context=request.context)
+                request.cr, request.uid, module, xml_id)
             view.write(request.cr, request.uid, [view_id],
                        {'inherit_id': view_option_id}, context=request.context)
 
@@ -135,7 +134,7 @@ class Website(openerp.addons.web.controllers.main.Home):
     def customize_template_get(self, xml_id):
         imd = request.registry['ir.model.data']
         view_model, view_theme_id = imd.get_object_reference(
-            request.cr, request.uid, 'website', 'theme', context=request.context)
+            request.cr, request.uid, 'website', 'theme')
 
         view = request.registry.get("ir.ui.view")
         views = view._views_get(request.cr, request.uid, xml_id, request.context)

diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index 6bdac7c..db38995 100644 (file)
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -124,10 +124,10 @@ 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, context),
+            'event_id': event_obj.browse(
+                            request.cr, request.uid, event_id,
+                            dict(request.context, show_address=1)),
             '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 1efcecc..3331be0 100644 (file)
--- a/addons/website_mail/controllers/main.py
+++ b/addons/website_mail/controllers/main.py
@@ -71,15 +71,13 @@ 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=context)
+                    context=dict(request.context, mail_create_nosubcribe=True))
             request.session.body = False
 
         if post.get('body'):
@@ -89,15 +87,13 @@ 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=context)
+                context=dict(request.context, mail_create_nosubscribe=True))
         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 612fa4e..a7ebef5 100644 (file)
--- a/addons/website_membership/controllers/main.py
+++ b/addons/website_membership/controllers/main.py
@@ -64,11 +64,9 @@ 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=context),
+                context=dict(request.context, show_address=True)),
         }
         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 3d66cc8..e50bdb7 100644 (file)
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -30,11 +30,8 @@ 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 = request.context.copy()
-    context.update({
-        'pricelist': order.pricelist_id.id,
-    })
-    return order_obj.browse(request.cr, SUPERUSER_ID, order_id, context=context)
+    return order_obj.browse(request.cr, SUPERUSER_ID, order_id,
+                            context=dict(request.context, pricelist=order.pricelist_id.id))
 
 def get_current_order():
     if request.httprequest.session.get('ecommerce_order_id'):
@@ -175,10 +172,7 @@ class Ecommerce(http.Controller):
         if not order:
             order = get_order()
 
-        context = request.context.copy()
-        context.update({
-            'pricelist': self.get_pricelist()
-        })
+        context = dict(request.context, pricelist=self.get_pricelist())
 
         quantity = 0