[REM] preprocess_request from website

The method is still there with only a pass statement
Will completetly remove once chm merges his branch

bzr revid: fme@openerp.com-20140505163841-lstk3r37sf23ngrg

addons/website/controllers/main.py

@@ -62,7 +62,7 @@ class Website(openerp.addons.web.controllers.main.Home):
             request.website.get_template(page)
         except ValueError, e:
             # page not found
-            if request.context['editable']:
+            if request.website.is_publisher():
                 page = 'website.page_404'
             else:
                 return request.registry['ir.http']._handle_exception(e, 404)

addons/website/models/ir_http.py

@@ -10,7 +10,7 @@ import werkzeug.routing
 import openerp
 from openerp.addons.base import ir
 from openerp.addons.base.ir import ir_qweb
-from openerp.addons.website.models.website import slug
+from openerp.addons.website.models.website import slug, url_for
 from openerp.http import request
 from openerp.osv import orm
 
@@ -49,6 +49,7 @@ class ir_http(orm.AbstractModel):
                 self._authenticate(func.routing['auth'])
             else:
                 self._auth_method_public()
+            request.redirect = lambda url: werkzeug.utils.redirect(url_for(url))
             request.website = request.registry['website'].get_current_website(request.cr, request.uid, context=request.context)
             if first_pass:
                 request.lang = request.website.default_lang_code

addons/website/models/ir_ui_view.py

@@ -132,8 +132,7 @@ class view(osv.osv):
             if not context:
                 context = {}
 
-            qcontext = dict(editable=False)
-            qcontext.update(
+            qcontext = dict(
                 context.copy(),
                 website=request.website,
                 url_for=website.url_for,
@@ -141,6 +140,7 @@ class view(osv.osv):
                 res_company=request.website.company_id,
                 user_id=self.pool.get("res.users").browse(cr, uid, uid),
                 translatable=context.get('lang') != request.website.default_lang_code,
+                editable=request.website.is_publisher(),
             )
 
             # add some values

addons/website/models/website.py

@@ -204,17 +204,12 @@ class website(osv.osv):
         return self.pool['website'].browse(cr, uid, 1, context=context)
 
     def preprocess_request(self, cr, uid, ids, request, context=None):
-        # TODO FP: is_website_publisher and editable in context should be removed
-        # for performance reasons (1 query per image to load) but also to be cleaner
-        # I propose to replace this by a group 'base.group_website_publisher' on the
-        # view that requires it.
-        Access = request.registry['ir.model.access']
-        is_website_publisher = Access.check(cr, uid, 'ir.ui.view', 'write', False, context)
+        pass
 
-        request.redirect = lambda url: werkzeug.utils.redirect(url_for(url))
-        request.context.update(
-            editable=is_website_publisher,
-        )
+    def is_publisher(self, cr, uid, ids, context=None):
+        Access = self.pool['ir.model.access']
+        is_website_publisher = Access.check(cr, uid, 'ir.ui.view', 'write', False, context)
+        return is_website_publisher
 
     def get_template(self, cr, uid, ids, template, context=None):
         if isinstance(template, (int, long)):