From 7db3619c379e28c034a348bc49abe32b0549f20b Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 6 May 2014 18:34:22 +0200 Subject: [PATCH] [REM] html_template and render_bootstrap_template() bzr revid: fme@openerp.com-20140506163422-vruavrvkcowu09zi --- addons/web/controllers/main.py | 59 +++++----------------------------- 1 file changed, 8 insertions(+), 51 deletions(-) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 863fba90758..5b2c7a5e91a 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -497,50 +497,6 @@ def content_disposition(filename): #---------------------------------------------------------- # OpenERP Web web Controllers #---------------------------------------------------------- - -# TODO: to remove once the database manager has been migrated server side -# and `edi` + `pos` addons has been adapted to use render_bootstrap_template() -html_template = """ - - - - - OpenERP - - - - %(css)s - %(js)s - - - - - - -""" - -def render_bootstrap_template(template, values=None, **kw): - if values is None: - values = dict() - try: - values['databases'] = http.db_list() - except openerp.exceptions.AccessDenied: - values['databases'] = None - - if 'modules' not in values: - values['modules'] = module_boot() - values['modules'] = simplejson.dumps(values['modules']) - - return request.render(template, values, **kw) - class Home(http.Controller): @http.route('/', type='http', auth="none") @@ -554,12 +510,7 @@ class Home(http.Controller): if request.session.uid: if kw.get('redirect'): return werkzeug.utils.redirect(kw.get('redirect'), 303) - - headers = { - 'Cache-Control': 'no-cache', - 'Content-Type': 'text/html; charset=utf-8', - } - return render_bootstrap_template("web.webclient_bootstrap", headers=headers) + return request.render('web.webclient_bootstrap') else: return login_redirect() @@ -577,6 +528,12 @@ class Home(http.Controller): if not redirect: redirect = '/web?' + request.httprequest.query_string values['redirect'] = redirect + + try: + values['databases'] = http.db_list() + except openerp.exceptions.AccessDenied: + values['databases'] = None + if request.httprequest.method == 'POST': old_uid = request.uid uid = request.session.authenticate(request.session.db, request.params['login'], request.params['password']) @@ -584,7 +541,7 @@ class Home(http.Controller): return http.redirect_with_hash(redirect) request.uid = old_uid values['error'] = "Wrong login/password" - return render_bootstrap_template('web.login', values) + return request.render('web.login', values) @http.route('/login', type='http', auth="none") def login(self, db, login, key, redirect="/web", **kw):