diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-12-09 15:07:00 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-12-09 15:07:00 +0100 |
| commit | 9c8422a405fb7631fa9fb1171286ca134cacad62 (patch) | |
| tree | 9980bf02391ecf75c6199abff8203542d4defe76 /addons/auth_signup/controllers/main.py | |
| parent | cb7517f7e5dd7c89f1f859e003653abc7acbc3ef (diff) | |
| parent | 75e7f0da10d1b74af09b1afdf74b19ef7a504f58 (diff) | |
[MERGE] forward port branch saas-6 up to 75e7f0d
Diffstat (limited to 'addons/auth_signup/controllers/main.py')
| -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 0092754e627..6be60d66508 100644 --- a/addons/auth_signup/controllers/main.py +++ b/addons/auth_signup/controllers/main.py @@ -66,8 +66,7 @@ class AuthSignupHome(openerp.addons.web.controllers.main.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) |