[IMP] Refactoring using `webcontext`

bzr revid: fme@openerp.com-20130904153236-gc78bs8pxeprktkr

1 files changed, 14 insertions, 15 deletions

diff --git a/addons/website_google_map/controllers/main.py b/addons/website_google_map/controllers/main.py
index fc2055032d8..3867a3f20f0 100644
--- a/addons/website_google_map/controllers/main.py
+++ b/addons/website_google_map/controllers/main.py
@@ -3,43 +3,42 @@
 import openerp
 from openerp.addons.web import http
 from openerp.addons.web.http import request
+from openerp.addons.website import website
 from datetime import datetime
 
 class google_map(http.Controller):
 
-    @http.route(['/google_map/'], type='http', auth="admin")
+    @website.route(['/google_map/'], type='http', auth="admin")
     def google_map(self, *arg, **post):
-        website = request.registry['website']
-        values = website.get_rendering_context()
-        values['partner_ids'] = post.get('partner_ids', "")
-        values['width'] = post.get('width', 900)
-        values['height'] = post.get('height', 460)
-        values['partner_url'] = post.get('partner_url')
-        return website.render("website_google_map.google_map", values)
-
-    @http.route(['/google_map/partners.json'], type='http', auth="admin")
+        values = {
+            'partner_ids': post.get('partner_ids', ""),
+            'width': post.get('width', 900),
+            'height': post.get('height', 460),
+            'partner_url': post.get('partner_url'),
+        }
+        return request.webcontext.render("website_google_map.google_map", values)
+
+    @website.route(['/google_map/partners.json'], type='http', auth="admin")
     def google_map_data(self, *arg, **post):
-        website = request.registry['website']
         partner_obj = request.registry['res.partner']
 
         domain = [("id", "in", [int(p) for p in post.get('partner_ids', "").split(",") if p])]
         partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, domain + [('website_published', '=', True)])
-        if request.uid != website.get_public_user().id:
+        if not request.webcontext.is_public_user:
             partner_ids += partner_obj.search(request.cr, request.uid, domain)
             partner_ids = list(set(partner_ids))
 
         return partner_obj.google_map_json(request.cr, openerp.SUPERUSER_ID, partner_ids)
 
-    @http.route(['/google_map/set_partner_position/'], type='http', auth="admin")
+    @website.route(['/google_map/set_partner_position/'], type='http', auth="admin")
     def google_map_set_partner_position(self, *arg, **post):
-        website = request.registry['website']
         partner_obj = request.registry['res.partner']
 
         partner_id = post.get('partner_id') and int(post['partner_id'])
         latitude = post.get('latitude') and float(post['latitude'])
         longitude = post.get('longitude') and float(post['longitude'])
 
-        if request.uid != website.get_public_user().id and partner_id and (latitude or longitude):
+        if not request.webcontext.is_public_user and partner_id and (latitude or longitude):
             values = {
                 'partner_latitude': latitude,
                 'partner_longitude': longitude,