mirror of
https://github.com/inventree/InvenTree.git
synced 2025-11-13 11:26:42 +00:00
* Ensure all user sessions are cleared
* remove double warning text on user delete
(cherry picked from commit 4794d69687)
Co-authored-by: Matthias Mair <code@mjmair.com>
This commit is contained in:
committed by
GitHub
parent
da3ebacf6b
commit
98b1678402
@@ -144,6 +144,14 @@ class UserDetail(RetrieveUpdateDestroyAPI):
|
||||
serializer_class = ExtendedUserSerializer
|
||||
permission_classes = [InvenTree.permissions.StaffRolePermissionOrReadOnly]
|
||||
|
||||
def perform_destroy(self, instance):
|
||||
"""Override destroy method to ensure sessions are deleted first."""
|
||||
# Remove all sessions for this user
|
||||
if sessions := instance.usersession_set.all():
|
||||
sessions.delete()
|
||||
# Normally delete the user
|
||||
return super().perform_destroy(instance)
|
||||
|
||||
|
||||
class UserDetailSetPassword(UpdateAPI):
|
||||
"""Allows superusers to set the password for a user."""
|
||||
|
||||
@@ -358,6 +358,7 @@ export function UserTable({
|
||||
title: t`Delete user`,
|
||||
successMessage: t`User deleted`,
|
||||
table: table,
|
||||
preFormContent: <></>,
|
||||
preFormWarning: t`Are you sure you want to delete this user?`
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user