[MERGE]sync with trunk

bzr revid: sgo@tinyerp.com-20130626111029-e6szwugpewn3cd2g

1 files changed, 13 insertions, 12 deletions

diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py
index 924e1546862..8c61af1f03c 100644
--- a/addons/auth_signup/controllers/main.py
+++ b/addons/auth_signup/controllers/main.py
@@ -23,14 +23,15 @@ import logging
 import openerp
 from openerp.modules.registry import RegistryManager
 from ..res_users import SignupError
+import openerp.addons.web.http as http
+from openerp.addons.web.http import request
 
 _logger = logging.getLogger(__name__)
 
-class Controller(openerp.addons.web.http.Controller):
-    _cp_path = '/auth_signup'
+class Controller(http.Controller):
 
-    @openerp.addons.web.http.jsonrequest
-    def get_config(self, req, dbname):
+    @http.route('/auth_signup/get_config', type='json', auth="none")
+    def get_config(self, dbname):
         """ retrieve the module config (which features are enabled) for the login page """
         registry = RegistryManager.get(dbname)
         with registry.cursor() as cr:
@@ -41,8 +42,8 @@ class Controller(openerp.addons.web.http.Controller):
             }
         return config
 
-    @openerp.addons.web.http.jsonrequest
-    def retrieve(self, req, dbname, token):
+    @http.route('/auth_signup/retrieve', type='json', auth="user")
+    def retrieve(self, dbname, token):
         """ retrieve the user info (name, login or email) corresponding to a signup token """
         registry = RegistryManager.get(dbname)
         with registry.cursor() as cr:
@@ -50,23 +51,23 @@ class Controller(openerp.addons.web.http.Controller):
             user_info = res_partner.signup_retrieve_info(cr, openerp.SUPERUSER_ID, token)
         return user_info
 
-    @openerp.addons.web.http.jsonrequest
-    def signup(self, req, dbname, token, **values):
+    @http.route('/auth_signup/signup', type='json', auth="user")
+    def signup(self, dbname, token, **values):
         """ sign up a user (new or existing)"""
         try:
-            self._signup_with_values(req, dbname, token, values)
+            self._signup_with_values(dbname, token, values)
         except SignupError, e:
             return {'error': openerp.tools.exception_to_unicode(e)}
         return {}
 
-    def _signup_with_values(self, req, dbname, token, values):
+    def _signup_with_values(self, dbname, token, values):
         registry = RegistryManager.get(dbname)
         with registry.cursor() as cr:
             res_users = registry.get('res.users')
             res_users.signup(cr, openerp.SUPERUSER_ID, values, token)
 
-    @openerp.addons.web.http.jsonrequest
-    def reset_password(self, req, dbname, login):
+    @http.route('/auth_signup/reset_password', type='json', auth="user")
+    def reset_password(self, dbname, login):
         """ retrieve user, and perform reset password """
         registry = RegistryManager.get(dbname)
         with registry.cursor() as cr: