From 88053a85a2543cd14c8f17e5bbcc3df684a2c4a5 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Thu, 6 Dec 2012 14:24:46 +0100 Subject: [PATCH] [IMP] auth_signup: move exception guard from second-order method to controller method bzr revid: rco@openerp.com-20121206132446-w1884yc337wj037d --- addons/auth_signup/controllers/main.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py index d2429e8dfd2..baf1a8f0b28 100644 --- a/addons/auth_signup/controllers/main.py +++ b/addons/auth_signup/controllers/main.py @@ -57,18 +57,17 @@ class Controller(openerp.addons.web.http.Controller): def signup(self, req, dbname, token, name, login, password): """ sign up a user (new or existing)""" values = {'name': name, 'login': login, 'password': password} - return self._signup_with_values(req, dbname, token, values) + try: + self._signup_with_values(req, dbname, token, values) + except SignupError, e: + return {'error': openerp.tools.exception_to_unicode(e)} + return {} def _signup_with_values(self, req, dbname, token, values): registry = RegistryManager.get(dbname) with registry.cursor() as cr: res_users = registry.get('res.users') - try: - res_users.signup(cr, openerp.SUPERUSER_ID, values, token) - except SignupError, e: - return {'error': openerp.tools.exception_to_unicode(e)} - cr.commit() - return {} + res_users.signup(cr, openerp.SUPERUSER_ID, values, token) @openerp.addons.web.http.httprequest def reset_password(self, req, dbname, login):