- {% if current_user.is_administrator() %}
+
{% if current_user.is_anonymous %}
- connexion
diff --git a/app/templates/email/reset_password.html b/app/templates/email/reset_password.html
index 430d53dedf..9e92a785e1 100644
--- a/app/templates/email/reset_password.html
+++ b/app/templates/email/reset_password.html
@@ -5,7 +5,7 @@
cliquez sur ce lien
.
-Vous pouvez aussi copier ce lien dans votre navigateur Web::
+Vous pouvez aussi copier ce lien dans votre navigateur Web:
{{ url_for('auth.reset_password', token=token, _external=True) }}
Si vous n'avez pas demandé à réinitialiser votre mot de passe sur
diff --git a/app/views/users.py b/app/views/users.py
index 84f1766068..e1709c92a5 100644
--- a/app/views/users.py
+++ b/app/views/users.py
@@ -46,7 +46,6 @@ from wtforms import HiddenField, PasswordField, StringField, SubmitField
from wtforms.validators import DataRequired, Email, ValidationError, EqualTo
from app import db
-from app.api.auth import verify_password
from app.auth.forms import DeactivateUserForm
from app.auth.models import Permission
from app.auth.models import User
@@ -92,20 +91,21 @@ class ChangePasswordForm(FlaskForm):
],
)
email = StringField(_l("Email"), validators=[DataRequired(), Email()])
- submit = SubmitField(_l("Modifier"))
+ submit = SubmitField()
+ cancel = SubmitField("Annuler")
def validate_email(self, email):
user = User.query.filter_by(email=email.data).first()
if user is not None and self.user_name.data != user.user_name:
- raise ValidationError(_("Please choose a different email address."))
+ raise ValidationError(_("Adresse e-mail invalide"))
def validate_new_password(self, new_password):
if new_password.data != "" and not is_valid_password(new_password.data):
raise ValidationError(f"Mot de passe trop simple, recommencez")
def validate_old_password(self, old_password):
- if not verify_password(self.user_name.data, old_password.data):
- raise ValidationError("Ancien mot de passe incorrect, recommenccez")
+ if not current_user.check_password(old_password.data):
+ raise ValidationError("Mot de passe actuel incorrect, ré-essayez")
@bp.route("/")
@@ -681,8 +681,31 @@ def import_users_form():
@scodoc
@permission_required(Permission.ScoUsersView)
@scodoc7func
-def user_info_page(user_name):
- return sco_users.user_info_page(user_name=user_name)
+def user_info_page(user_name=None):
+ """Display page of info about given user.
+ If user_name not specified, user current_user
+ """
+ from app.scodoc.sco_permissions_check import can_handle_passwd
+
+ # peut on divulguer ces infos ?
+ if not can_handle_passwd(current_user, allow_admindepts=True):
+ raise AccessDenied("Vous n'avez pas la permission de voir cette page")
+
+ dept = g.scodoc_dept
+ if not user_name:
+ user = current_user
+ else:
+ user = User.query.filter_by(user_name=user_name).first()
+ if not user:
+ raise ScoValueError("invalid user_name")
+
+ return render_template(
+ "auth/user_info_page.html",
+ user=user,
+ title=f"Utilisateur {user.user_name}",
+ Permission=Permission,
+ dept=dept,
+ )
@bp.route("/get_user_list_xml")
@@ -736,6 +759,13 @@ def form_change_password(user_name=None):
]
)
form = ChangePasswordForm(user_name=user.user_name, email=user.email)
+ destination = url_for(
+ "users.user_info_page",
+ scodoc_dept=g.scodoc_dept,
+ user_name=user_name,
+ )
+ if request.method == "POST" and form.cancel.data: # cancel button clicked
+ return redirect(destination)
if form.validate_on_submit():
messages = []
if form.new_password.data != "": # change password
@@ -746,7 +776,11 @@ def form_change_password(user_name=None):
messages.append("Adresse email modifiée")
db.session.commit()
flash("\n".join(messages))
- return render_template("auth/change_password.html", form=form)
+ return redirect(destination)
+
+ return render_template(
+ "auth/change_password.html", form=form, title="Modification compte ScoDoc"
+ )
@bp.route("/change_password", methods=["POST"])
diff --git a/sco_version.py b/sco_version.py
index 34c13b803b..4bb48370f7 100644
--- a/sco_version.py
+++ b/sco_version.py
@@ -1,7 +1,7 @@
# -*- mode: python -*-
# -*- coding: utf-8 -*-
-SCOVERSION = "9.0.53"
+SCOVERSION = "9.0.54"
SCONAME = "ScoDoc"