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

[IMP] use 'error' key in login template 

bzr revid: fme@openerp.com-20140121093224-8auf7b00jxfq8940
This commit is contained in:
Fabien Meghazi 2014-01-21 10:32:24 +01:00
parent bb3118ac3d
commit f43f06a6b0
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -635,7 +635,7 @@ class Home(http.Controller):
uid = request.session.authenticate(request.session.db, request.params['login'], request.params['password']) uid = request.session.authenticate(request.session.db, request.params['login'], request.params['password'])
if uid is not False: if uid is not False:
return redirect_with_hash(redirect) return redirect_with_hash(redirect)
values['authentication_failed'] = True values['error'] = "Wrong login/password"
return render_bootstrap_template(request.session.db, 'web.login', values, debug=request.debug, lazy=True) return render_bootstrap_template(request.session.db, 'web.login', values, debug=request.debug, lazy=True)
@http.route('/login', type='http', auth="none") @http.route('/login', type='http', auth="none")

8
addons/web/views/webclient_templates.xml
View File

@ -85,11 +85,9 @@
<input type="password" name="password" id="password" class="form-control" placeholder="Password" required="required"/> <input type="password" name="password" id="password" class="form-control" placeholder="Password" required="required"/>
</div> </div>
<div class="oe_login_messages"> <p class="alert alert-danger" t-if="error">
<p class="alert alert-danger" t-if="authentication_failed"> <t t-esc="error"/>
Wrong login/password </p>
</p>
</div>
<hr/> <hr/>
<input type="hidden" name="redirect" t-att-value="redirect"/> <input type="hidden" name="redirect" t-att-value="redirect"/>