[MERGE] from website-al

bzr revid: chm@openerp.com-20130906083500-4n5knaxiqt4cg2ht

1 files changed, 5 insertions, 5 deletions

diff --git a/addons/website_hr/controllers/main.py b/addons/website_hr/controllers/main.py
index 76bb6f9a7ad..1ce48894e26 100644
--- a/addons/website_hr/controllers/main.py
+++ b/addons/website_hr/controllers/main.py
@@ -2,15 +2,15 @@
 
 from openerp.addons.web import http
 from openerp.addons.web.http import request
+from openerp.addons.website import website
 
 class website_hr(http.Controller):
 
-    @http.route(['/page/website.aboutus'], type='http', auth="public")
+    @website.route(['/page/website.aboutus'], type='http', auth="public")
     def blog(self, **post):
-        website = request.registry['website']
         hr_obj = request.registry['hr.employee']
         employee_ids = hr_obj.search(request.cr, request.uid, [(1, "=", 1)])
-        values = website.get_rendering_context({
+        values = {
             'employee_ids': hr_obj.browse(request.cr, request.uid, employee_ids)
-        })
-        return website.render("website.aboutus", values)
+        }
+        return request.webcontext.render("website.aboutus", values)