odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[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
This commit is contained in:
Fabien Meghazi 2014-05-05 18:38:41 +02:00
parent 868f54780e
commit cf8cf4f255
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/website/controllers/main.py
View File

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

3
addons/website/models/ir_http.py
View File

@ -10,7 +10,7 @@ import werkzeug.routing
import openerp import openerp
from openerp.addons.base import ir from openerp.addons.base import ir
from openerp.addons.base.ir import ir_qweb 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.http import request
from openerp.osv import orm from openerp.osv import orm
@ -49,6 +49,7 @@ class ir_http(orm.AbstractModel):
self._authenticate(func.routing['auth']) self._authenticate(func.routing['auth'])
else: else:
self._auth_method_public() 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) request.website = request.registry['website'].get_current_website(request.cr, request.uid, context=request.context)
if first_pass: if first_pass:
request.lang = request.website.default_lang_code request.lang = request.website.default_lang_code

4
addons/website/models/ir_ui_view.py
View File

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

15
addons/website/models/website.py
View File

@ -204,17 +204,12 @@ class website(osv.osv):
return self.pool['website'].browse(cr, uid, 1, context=context) return self.pool['website'].browse(cr, uid, 1, context=context)
def preprocess_request(self, cr, uid, ids, request, context=None): def preprocess_request(self, cr, uid, ids, request, context=None):
# TODO FP: is_website_publisher and editable in context should be removed pass
# 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)
request.redirect = lambda url: werkzeug.utils.redirect(url_for(url)) def is_publisher(self, cr, uid, ids, context=None):
request.context.update( Access = self.pool['ir.model.access']
editable=is_website_publisher, 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): def get_template(self, cr, uid, ids, template, context=None):
if isinstance(template, (int, long)): if isinstance(template, (int, long)):