diff --git a/mondumas/routes.py b/mondumas/routes.py
index b718cdb..8c3cdd2 100644
--- a/mondumas/routes.py
+++ b/mondumas/routes.py
@@ -11,10 +11,11 @@ def includeme(config):
config.add_route('login', '/login')
config.add_route('logout', '/logout')
config.add_route('redefinir_mdp', '/redefinir_mdp/{lien}')
+ config.add_route('init_mdp', '/init_mdp/{user}/{lien}')
# dossier
config.add_route('devis_view', '/devis_view/{nodossier}')
config.add_route('dossier_edit', '/dossier_edit/{nodossier}')
- config.add_route('dossier_lookup', '/chantier_lookup')
+ config.add_route('dossier_lookup', '/dossier_lookup')
config.add_route('dossier_select', '/dossier_select/{date}')
config.add_route('dossier_selected', '/dossier_selected/{goto}/{date}/{nodossier}')
config.add_route('dossier_view', '/dossier_view/{nodossier}')
diff --git a/mondumas/templates/default/home.pt b/mondumas/templates/default/home.pt
index 80be4df..3428be6 100644
--- a/mondumas/templates/default/home.pt
+++ b/mondumas/templates/default/home.pt
@@ -20,7 +20,7 @@
RAPPORTS RDF
diff --git a/mondumas/templates/layouts/global_layout.pt b/mondumas/templates/layouts/global_layout.pt
index 30cc256..78e674c 100644
--- a/mondumas/templates/layouts/global_layout.pt
+++ b/mondumas/templates/layouts/global_layout.pt
@@ -54,7 +54,7 @@
-
- Recherche
+ Recherche
-
Paramètres
${panel('dropdown_menu_panel')}
diff --git a/mondumas/templates/parametres/user_edit.pt b/mondumas/templates/parametres/user_edit.pt
index ddf946e..cfb826c 100644
--- a/mondumas/templates/parametres/user_edit.pt
+++ b/mondumas/templates/parametres/user_edit.pt
@@ -82,12 +82,13 @@
diff --git a/mondumas/views/default.py b/mondumas/views/default.py
index 0034fe4..3c8c2c2 100644
--- a/mondumas/views/default.py
+++ b/mondumas/views/default.py
@@ -134,17 +134,29 @@ def changer_mdp(request):
}
@view_config(route_name='redefinir_mdp', renderer='../templates/default/redefinir_mdp.pt')
+@view_config(route_name='init_mdp', renderer='../templates/default/redefinir_mdp.pt')
def redefinir_mdp(request):
- lien = request.matchdict["lien"]
- url = request.route_url('redefinir_mdp', lien=lien)
-
- # tester si le champ "motdepasse_oublie" est encore valide
- membre = get_member_by_mdp_oublie(request, lien)
+ if request.matched_route.name == 'redefinir_mdp':
+ lien = request.matchdict["lien"]
+ url = request.route_url('redefinir_mdp', lien=lien)
+ # tester si le champ "motdepasse_oublie" est encore valide
+ membre = get_member_by_mdp_oublie(request, lien)
+ else:
+ user = request.matchdict["user"]
+ lien = request.matchdict["lien"]
+ url = request.route_url('init_mdp', user=user, lien=lien)
+ # tester valeur OK ?
+ if lien == date.today().strftime('%d%m%Y'):
+ # oui, lire le membre
+ membre = get_member_by_id(request, user)
+ else:
+ membre = None
+
if membre:
if 'form.submitted' in request.params:
login = request.params["login"]
mdp = request.params["new_password1"]
- if login == membre.cd_uti:
+ if login == membre.CD_UTI:
update_membre_mdp(request, login, mdp)
request.session.flash(u"Votre mot de passe a été modifié avec succès.", 'success')
return HTTPFound(location=request.route_url('login'))
@@ -154,6 +166,7 @@ def redefinir_mdp(request):
else:
request.session.flash(u"Le lien n'est plus valable.", 'warning')
return HTTPFound(location=request.route_url('login'))
+
return {
'page_title': u"Définissez votre mot de passe",
'url': url,
diff --git a/mondumas/views/parametres.py b/mondumas/views/parametres.py
index fec36ca..b44ba16 100644
--- a/mondumas/views/parametres.py
+++ b/mondumas/views/parametres.py
@@ -150,6 +150,7 @@ def user_edit(request):
'individu': individu,
'access': access,
'message': message,
+ 'lienmdp': '%s/%s' % (individu.CD_UTI, date.today().strftime('%d%m%Y'))
}
@view_config(route_name='dashboard', renderer='../templates/parametres/dashboard.pt', permission='manage')