diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-12-09 15:09:36 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-12-09 15:09:36 +0100 |
| commit | 321b7dc5b64a2829e919c5a90aa4806badd3f31b (patch) | |
| tree | a3d3bf512f467e194eb307ddd19013590825948b /addons/auth_signup/controllers | |
| parent | 5593d2c89bf5d02608e4e2e7e46c5cb4d7c815dd (diff) | |
| parent | 9c8422a405fb7631fa9fb1171286ca134cacad62 (diff) | |
[MERGE] forward port branch 9.0 up to 9c8422a
Diffstat (limited to 'addons/auth_signup/controllers')
| -rw-r--r-- | addons/auth_signup/controllers/main.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py index 716175a5fd8..2718e47dd2a 100644 --- a/addons/auth_signup/controllers/main.py +++ b/addons/auth_signup/controllers/main.py @@ -63,8 +63,7 @@ class AuthSignupHome(Home): qcontext['error'] = _("Could not reset your password") _logger.exception('error when resetting password') except Exception, e: - qcontext['error'] = e.message - + qcontext['error'] = e.message or e.name return request.render('auth_signup.reset_password', qcontext) |