X-Git-Url: https://scm.cri.ensmp.fr/git/Plinn.git/blobdiff_plain/959d888c17d1403d2eeecc19bc4b5e2c8d1debf6..ae75bab9028d6321710c42da338cef25c7afe576:/Products/Plinn/skins/generic/password_reset_form.py

diff --git a/Products/Plinn/skins/generic/password_reset_form.py b/Products/Plinn/skins/generic/password_reset_form.py
index eaa2eb7..7bd487a 100644
--- a/Products/Plinn/skins/generic/password_reset_form.py
+++ b/Products/Plinn/skins/generic/password_reset_form.py
@@ -9,20 +9,20 @@ uuid = traverse_subpath[0]
 
 passwordChanged = False
 
-if validate and \
-    context.validatePassword(**form) :
-    userid = context.reset_password_control(uuid=uuid, **form)
-    if userid :
+if validate :
+    infos = context.reset_password_control(uuid=uuid, **form)
+    if infos :
         passwordChanged = True
 
 options = {}
 options['uuid'] = uuid
 options['passwordChanged'] = passwordChanged
 if passwordChanged :
-    hidden_vars = ({'name' : '__ac_name',       'value' : userid},
+    hidden_vars = ({'name' : '__ac_name',       'value' : infos['userid']},
                    {'name' : '__ac_password',   'value' : form['password']},
+                   {'name' : 'came_from',       'value' : infos['came_from']},
                    {'name' : 'noAjax',          'value' : '1'})
-    target = utool()
+    target = atool.getActionInfo('user/logged_in')['url']
     buttons = ({'name': 'login', 'value': _(' Login ')},)
 else :
     hidden_vars = []