[IMP] Refactor code + WIP multiwebsite

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

1 files changed, 3 insertions, 3 deletions

diff --git a/addons/website_google_map/controllers/main.py b/addons/website_google_map/controllers/main.py
index 2b6a8eccd06..20b855f44e2 100644
--- a/addons/website_google_map/controllers/main.py
+++ b/addons/website_google_map/controllers/main.py
@@ -16,7 +16,7 @@ class google_map(http.Controller):
             'height': post.get('height', 460),
             'partner_url': post.get('partner_url'),
         }
-        return request.webcontext.render("website_google_map.google_map", values)
+        return request.website.render("website_google_map.google_map", values)
 
     @website.route(['/google_map/partners.json'], type='http', auth="admin")
     def google_map_data(self, *arg, **post):
@@ -26,7 +26,7 @@ class google_map(http.Controller):
         domain_public = domain + [('website_published', '=', True)]
         partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID,
                                          domain_public, context=request.context)
-        if not request.webcontext.is_public_user:
+        if not request.context['is_public_user']:
             partner_ids += partner_obj.search(request.cr, request.uid, domain,
                                               context=request.context)
             partner_ids = list(set(partner_ids))
@@ -42,7 +42,7 @@ class google_map(http.Controller):
         latitude = post.get('latitude') and float(post['latitude'])
         longitude = post.get('longitude') and float(post['longitude'])
 
-        if not request.webcontext.is_public_user and partner_id and (latitude or longitude):
+        if not request.context['is_public_user'] and partner_id and (latitude or longitude):
             values = {
                 'partner_latitude': latitude,
                 'partner_longitude': longitude,