[MERGE] from website-al

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

1 files changed, 8 insertions, 15 deletions

diff --git a/addons/website_project/controllers/main.py b/addons/website_project/controllers/main.py
index 1d87564bfa9..8132f2959b5 100644
--- a/addons/website_project/controllers/main.py
+++ b/addons/website_project/controllers/main.py
@@ -3,31 +3,24 @@
 from openerp.osv import osv
 from openerp.addons.web import http
 from openerp.addons.web.http import request
+from openerp.addons.website import website
 
 
-class website(osv.osv):
+class Website(osv.osv):
     _inherit = "website"
-    def get_rendering_context(self, additional_values=None):
+    def get_webcontext(self, values={}, **kw):
         project_obj = request.registry['project.project']
         project_ids = project_obj.search(request.cr, request.uid, [('privacy_visibility', "=", "public")])
-        values = {
+        values.update({
             'project_ids': project_obj.browse(request.cr, request.uid, project_ids),
-        }
-        if additional_values:
-            values.update(additional_values)
-        return super(website, self).get_rendering_context(values)
+        })
+        return super(Website, self).get_webcontext(values, **kw)
 
 
 class website_project(http.Controller):
 
-    @http.route(['/project/<int:project_id>/'], type='http', auth="public")
+    @website.route(['/project/<int:project_id>/'], type='http', auth="public")
     def blog(self, project_id=None, **post):
-        website = request.registry['website']
         project_obj = request.registry['project.project']
-
         project = project_obj.browse(request.cr, request.uid, project_id)
-
-        values = website.get_rendering_context({
-            'project_id': project,
-        })
-        return website.render("website_project.index", values)
+        return request.webcontext.render("website_project.index", {'project_id': project})