projects
/
Plinn.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prise en charge de la redirection vers « came_from » lors de la ré-initialisation...
[Plinn.git]
/
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
9cb4b1d
..
7bd487a
100644
(file)
--- a/
Products/Plinn/skins/generic/password_reset_form.py
+++ b/
Products/Plinn/skins/generic/password_reset_form.py
@@
-10,18
+10,19
@@
uuid = traverse_subpath[0]
passwordChanged = False
if validate :
passwordChanged = False
if validate :
-
userid
= context.reset_password_control(uuid=uuid, **form)
- if
userid
:
+
infos
= context.reset_password_control(uuid=uuid, **form)
+ if
infos
:
passwordChanged = True
options = {}
options['uuid'] = uuid
options['passwordChanged'] = passwordChanged
if passwordChanged :
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' : '__ac_password', 'value' : form['password']},
+ {'name' : 'came_from', 'value' : infos['came_from']},
{'name' : 'noAjax', 'value' : '1'})
{'name' : 'noAjax', 'value' : '1'})
- target =
utool()
+ target =
atool.getActionInfo('user/logged_in')['url']
buttons = ({'name': 'login', 'value': _(' Login ')},)
else :
hidden_vars = []
buttons = ({'name': 'login', 'value': _(' Login ')},)
else :
hidden_vars = []