From a5b9cf676515e0071e85a13a192b8e55158d030d Mon Sep 17 00:00:00 2001 From: Phuoc CAO Date: Fri, 18 Jan 2019 15:32:56 +0100 Subject: [PATCH] =?UTF-8?q?correction=20bug=20mot=20de=20passe=20oubli?= =?UTF-8?q?=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- caotek_mesavoirs/models/members.py | 13 ++++++------- caotek_mesavoirs/templates/actifs/actif2_edit.pt | 8 +++++++- caotek_mesavoirs/templates/actifs/actif_edit.pt | 8 +++++++- caotek_mesavoirs/templates/home.pt | 11 +++++++++-- caotek_mesavoirs/templates/members/user_edit.pt | 2 +- production.ini | 2 +- 6 files changed, 31 insertions(+), 13 deletions(-) diff --git a/caotek_mesavoirs/models/members.py b/caotek_mesavoirs/models/members.py index 8c43d2d..eff482b 100644 --- a/caotek_mesavoirs/models/members.py +++ b/caotek_mesavoirs/models/members.py @@ -33,15 +33,14 @@ def get_member_by_email(request, email): return results def update_membre_mdp_oublie(request, login): - import base64 - import uuid + import uuid, base64 # get a UUID - URL safe, Base64 - r_uuid = base64.urlsafe_b64encode(uuid.uuid4().bytes) - r_uuid = r_uuid.replace('=', '') - query = "UPDATE members SET mdp_oublie=:r_uuid, mdp_oublie_date=now() WHERE email=:login;" - execute_query(request, query, {'r_uuid':r_uuid, 'login':login}) - return r_uuid + uid = uuid.uuid1() + urlslug = base64.urlsafe_b64encode(uid.bytes).decode("utf-8").rstrip('=\n').replace('/', '_') + query = "UPDATE members SET mdp_oublie=:urlslug, mdp_oublie_date=now() WHERE email=:login;" + execute_query(request, query, {'urlslug':urlslug, 'login':login}) + return urlslug def update_membre_mdp(request, login, password): """Update password for member login""" diff --git a/caotek_mesavoirs/templates/actifs/actif2_edit.pt b/caotek_mesavoirs/templates/actifs/actif2_edit.pt index 8a830c9..eaddaa2 100644 --- a/caotek_mesavoirs/templates/actifs/actif2_edit.pt +++ b/caotek_mesavoirs/templates/actifs/actif2_edit.pt @@ -77,10 +77,16 @@ +
+ +
+

${actif.modif_le.strftime('%d/%m/%Y - %H:%M')}

+
+
- + Retour diff --git a/caotek_mesavoirs/templates/actifs/actif_edit.pt b/caotek_mesavoirs/templates/actifs/actif_edit.pt index 315aad7..70ae4ed 100644 --- a/caotek_mesavoirs/templates/actifs/actif_edit.pt +++ b/caotek_mesavoirs/templates/actifs/actif_edit.pt @@ -104,11 +104,17 @@ Consulter
+
+ +
+

${actif.modif_le.strftime('%d/%m/%Y - %H:%M')}

+
+

- + Retour diff --git a/caotek_mesavoirs/templates/home.pt b/caotek_mesavoirs/templates/home.pt index 3aa5959..52da49e 100644 --- a/caotek_mesavoirs/templates/home.pt +++ b/caotek_mesavoirs/templates/home.pt @@ -30,8 +30,6 @@ -

Allocation inspirée du Lazy portfolio du - Dr. Bernstein's No Brainer.

@@ -60,7 +58,16 @@
+
+
Allocation globale
+
60% Actions + 40% Obligations
+
Allocation actions A
+
60% US + 30% Europe + 20% Japon (2/3)
+
Allocation actions B
+
85% World + 15% Emergents (1/3)
+
+
diff --git a/caotek_mesavoirs/templates/members/user_edit.pt b/caotek_mesavoirs/templates/members/user_edit.pt index daa1c58..9eb5046 100644 --- a/caotek_mesavoirs/templates/members/user_edit.pt +++ b/caotek_mesavoirs/templates/members/user_edit.pt @@ -74,7 +74,7 @@ diff --git a/production.ini b/production.ini index a01b78f..ba724f0 100644 --- a/production.ini +++ b/production.ini @@ -17,7 +17,7 @@ pyramid.includes = pyramid_mailer pyramid_tm -sqlalchemy.url = mysql://root:phuoc@localhost/bd_mesavoirs?charset=utf8 +sqlalchemy.url = mysql://phuoc:phuoc!@localhost/bd_mesavoirs?charset=utf8 sqlalchemy.pool_recycle = 3600 caotek_mesavoirs.admin_email = phuoc@caotek.fr