From 8f1e465280f9b3bf43206856ae0ce744925ca35c Mon Sep 17 00:00:00 2001
From: Place Jean-Marie <jean-marie.place@univ-lille.fr>
Date: Sat, 30 Oct 2021 12:05:51 +0200
Subject: [PATCH] show current user name while getting old_password

---
 app/templates/auth/change_password.html | 20 ++++++++++++++------
 app/views/users.py                      |  6 +++++-
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/templates/auth/change_password.html b/app/templates/auth/change_password.html
index 975e8bc97..2bec77622 100644
--- a/app/templates/auth/change_password.html
+++ b/app/templates/auth/change_password.html
@@ -1,9 +1,13 @@
 {% extends "base.html" %}
 {% import 'bootstrap/wtf.html' as wtf %}
 
-{% macro render_field(field) %}
+{% macro render_field(field, auth_name=None) %}
 <tr style="">
-    <td class="wtf-field">{{ field.label }}</td>
+    {%  if auth_name %}
+        <td class="wtf-field"> {{ field.label }}<span style="font-weight:700;"> ({{ auth_name }}):</span></td>
+    {% else %}
+        <td class="wtf-field">{{ field.label }}</td>
+    {%  endif %}
     <td class="wtf-field">{{ field(**kwargs)|safe }}
         {% if field.errors %}
         <ul class=errors>
@@ -20,16 +24,20 @@
 <h1>Modification du compte ScoDoc <tt>{{form.user_name.data}}</tt></h1>
     <div class="help">
     <p>Identifiez-vous avez votre mot de passe actuel</p>
-    <p>Vous pouvez changer le mot de passe et/ou l'adresse email.</p>
-    <p>Les champs vides ne seront pas changés.</p>
     </div>
     <form method=post>
             {{ form.user_name }}
             {{ form.csrf_token }}
         <table class="tf"><tbody>
-            {{ render_field(form.old_password, size=14, 
+            {{ render_field(form.old_password, size=14, auth_name=auth_username,
             style="padding:1px; margin-left: 1em; margin-top: 4px;") }}
-            {{ render_field(form.new_password, size=14, 
+            <tr>
+                <td colspan=""2">
+    <p>Vous pouvez changer le mot de passe et/ou l'adresse email.</p>
+    <p>Les champs laissés vides ne seront pas modifiés.</p>
+                </td>
+            </tr>
+            {{ render_field(form.new_password, size=14,
             style="padding:1px; margin-left: 1em; margin-top: 12px;") }}
             {{ render_field(form.bis_password, size=14, 
             style="padding:1px; margin-left: 1em; margin-top: 4px;") }}
diff --git a/app/views/users.py b/app/views/users.py
index 79b5e095f..53f60030b 100644
--- a/app/views/users.py
+++ b/app/views/users.py
@@ -152,6 +152,7 @@ def user_info(user_name, format="json"):
 def create_user_form(user_name=None, edit=0, all_roles=1):
     "form. création ou edition utilisateur"
     auth_dept = current_user.dept
+    auth_username = current_user.user_name
     initvalues = {}
     edit = int(edit)
     all_roles = int(all_roles)
@@ -795,7 +796,10 @@ def form_change_password(user_name=None):
         return redirect(destination)
 
     return render_template(
-        "auth/change_password.html", form=form, title="Modification compte ScoDoc"
+        "auth/change_password.html",
+        form=form,
+        title="Modification compte ScoDoc",
+        auth_username=current_user.user_name,
     )