jmartin/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Projects Releases Wiki Activity

show current user name while getting old_password

Browse Source
This commit is contained in:
Jean-Marie Place 2021-10-30 12:05:51 +02:00
parent c248def7f2
commit 8f1e465280
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/templates/auth/change_password.html
View File

@ -1,9 +1,13 @@
{% extends "base.html" %} {% extends "base.html" %}
{% import 'bootstrap/wtf.html' as wtf %} {% import 'bootstrap/wtf.html' as wtf %}
{% macro render_field(field) %} {% macro render_field(field, auth_name=None) %}
<tr style=""> <tr style="">
{% 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> <td class="wtf-field">{{ field.label }}</td>
{% endif %}
<td class="wtf-field">{{ field(**kwargs)|safe }} <td class="wtf-field">{{ field(**kwargs)|safe }}
{% if field.errors %} {% if field.errors %}
<ul class=errors> <ul class=errors>
@ -20,15 +24,19 @@
<h1>Modification du compte ScoDoc <tt>{{form.user_name.data}}</tt></h1> <h1>Modification du compte ScoDoc <tt>{{form.user_name.data}}</tt></h1>
<div class="help"> <div class="help">
<p>Identifiez-vous avez votre mot de passe actuel</p> <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> </div>
<form method=post> <form method=post>
{{ form.user_name }} {{ form.user_name }}
{{ form.csrf_token }} {{ form.csrf_token }}
<table class="tf"><tbody> <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;") }} style="padding:1px; margin-left: 1em; margin-top: 4px;") }}
<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, {{ render_field(form.new_password, size=14,
style="padding:1px; margin-left: 1em; margin-top: 12px;") }} style="padding:1px; margin-left: 1em; margin-top: 12px;") }}
{{ render_field(form.bis_password, size=14, {{ render_field(form.bis_password, size=14,

6
app/views/users.py
View File

@ -152,6 +152,7 @@ def user_info(user_name, format="json"):
def create_user_form(user_name=None, edit=0, all_roles=1): def create_user_form(user_name=None, edit=0, all_roles=1):
"form. création ou edition utilisateur" "form. création ou edition utilisateur"
auth_dept = current_user.dept auth_dept = current_user.dept
auth_username = current_user.user_name
initvalues = {} initvalues = {}
edit = int(edit) edit = int(edit)
all_roles = int(all_roles) all_roles = int(all_roles)
@ -795,7 +796,10 @@ def form_change_password(user_name=None):
return redirect(destination) return redirect(destination)
return render_template( 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,
) )