globuzma/canaille-globuzma
1
0
Fork 0
forked from Github-Mirrors/canaille
Code Pull requests Activity

Merge branch 'account-lockability-fix' into 'main'

Browse source 
fix: user deletion on instances without account lockability

See merge request yaal/canaille!153
This commit is contained in:
Éloi Rivard 2023-09-28 16:35:22 +00:00
commit d1f8a95f08
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGES.rst
View file

@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
The format is based on `Keep a Changelog <https://keepachangelog.com/en/1.0.0/>`_, The format is based on `Keep a Changelog <https://keepachangelog.com/en/1.0.0/>`_,
and this project adheres to `Semantic Versioning <https://semver.org/spec/v2.0.0.html>`_. and this project adheres to `Semantic Versioning <https://semver.org/spec/v2.0.0.html>`_.
Fixed
*****
- Canaille installations without account lockabilty could not
delete users. :pr:`153`
Added Added
***** *****

6
canaille/core/account.py
View file

@ -666,11 +666,7 @@ def profile_settings(user, edited_user):
): ):
return profile_settings_edit(user, edited_user) return profile_settings_edit(user, edited_user)
if ( if request.form.get("action") == "confirm-delete":
request.form.get("action") == "confirm-delete"
and BaseBackend.get().has_account_lockability()
and not edited_user.locked
):
return render_template("modals/delete-account.html", edited_user=edited_user) return render_template("modals/delete-account.html", edited_user=edited_user)
if request.form.get("action") == "delete": if request.form.get("action") == "delete":