Merge branch 'master' into Develop

# Conflicts: # cps/ub.py
2020-05-13 20:03:54 +02:00
parent 0cc2b49296 ac37483d47
commit 273572f44c
3 changed files with 8 additions and 1 deletions
--- a/cps/admin.py
+++ b/cps/admin.py
@ -969,7 +969,7 @@ def reset_user_password(user_id):
    if current_user is not None and current_user.is_authenticated:
        ret, message = reset_password(user_id)
        if ret == 1:
-            log.debug(u"Password for user %(user)s reset", user=message)
+            log.debug(u"Password for user %s reset", message)
            flash(_(u"Password for user %(user)s reset", user=message), category="success")
        elif ret == 0:
            log.error(u"An unknown error occurred. Please try again later.")