Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix save and update user #1019

Merged
merged 2 commits into from
Jan 22, 2025
+44 −6
Merged

Fix save and update user #1019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbdfe1c
Fix save and update user
Jan 22, 2025
fa502fe
Merge branch 'dev' into fix_user_update_password
wlorenzetti Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions g3w-admin/usersmanage/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,12 +538,32 @@ def filterFieldsByRoles(self, **kwargs):


def save(self, commit=True):
user = super(UserCreationForm, self).save(commit=False)

# Not inherit from ancestor for new Django 4.2 UserCreationForm
if self.errors:
raise ValueError(
"The %s could not be %s because the data didn't validate."
% (
self.instance._meta.object_name,
"created" if self.instance._state.adding else "changed",
)
)
# If not committing, add a method to the form to allow deferred
# saving of m2m data.
self.save_m2m = self._save_m2m

user = self.instance

# if editor maps groups user add viewer maps groups group to the user saved
if commit:

user.save()
if hasattr(self, "save_m2m"):
self.save_m2m()

if self.cleaned_data['password1']:
user.set_password(self.cleaned_data['password1'])
user.save()
user.save()

# for save groups
if 'groups' not in self.cleaned_data:
Expand Down Expand Up @@ -722,16 +742,12 @@ class G3WUserUpdateForm(G3WUserForm):
widget=forms.PasswordInput, required=False,
help_text=_("Enter the same password as above, for verification."))

password = ReadOnlyPasswordHashField()

def clean_username(self):
"""Reject usernames that differ only in case."""
username = self.cleaned_data.get("username")

return username

def clean_password(self):
return self.initial['password']

def clean_password2(self):
password1 = self.cleaned_data.get("password1")
Expand Down
22 changes: 22 additions & 0 deletions g3w-admin/usersmanage/tests/test_forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ def test_user_form_crud(self):
'username': 'admin01_test',
'password1': self.users_password,
'password2': self.users_password,
'is_active': True,
'is_superuser': True,
'is_staff': True,
'groups': [self.main_roles[G3W_EDITOR1].pk], # required also fro admin1 and admin2
Expand All @@ -65,6 +66,13 @@ def test_user_form_crud(self):
u = User.objects.get(username='admin01_test')
self.assertTrue(u.is_superuser)
self.assertTrue(u.is_staff)
self.assertTrue(u.is_active)

# Check password is not changed making a login
self.client.logout()
login = self.client.login(username='admin01_test', password=self.users_password)
self.assertTrue(login)
self.client.logout()

u.delete()
del(u)
Expand All @@ -74,6 +82,7 @@ def test_user_form_crud(self):
'username': 'admin01_test',
'password1': self.users_password,
'password2': self.users_password,
'is_active': True,
'is_superuser': True,
'is_staff': True,
'groups': [self.main_roles[G3W_EDITOR1].pk], # required also for admin1 and admin2
Expand Down Expand Up @@ -109,6 +118,11 @@ def test_user_form_crud(self):
self.assertTrue(u.is_superuser)
self.assertTrue(u.is_staff)

# Check password is not changed making a login
login = self.client.login(username='admin01_test_updated', password=self.users_password)
self.assertTrue(login)
self.client.logout()

u.delete()
del(u)

Expand Down Expand Up @@ -138,6 +152,7 @@ def test_user_form_crud(self):
'username': 'admin02_test',
'password1': self.users_password,
'password2': self.users_password,
'is_active': True,
'is_superuser': True,
'is_staff': True,
'groups': [self.main_roles[G3W_EDITOR1].pk],
Expand Down Expand Up @@ -171,6 +186,7 @@ def test_user_form_crud(self):
'username': 'editor1_test',
'password1': self.users_password,
'password2': self.users_password,
'is_active': True,
'is_superuser': False,
'is_staff': True,
'groups': [self.main_roles[G3W_EDITOR1].pk, self.main_roles[G3W_VIEWER1].pk], # required also for admin1 and admin2
Expand Down Expand Up @@ -208,6 +224,7 @@ def test_user_form_crud(self):
'username': 'editor2_test',
'password1': self.users_password,
'password2': self.users_password,
'is_active': True,
'is_superuser': True,
'is_staff': True,
'groups': [self.main_roles[G3W_EDITOR2].pk],
Expand Down Expand Up @@ -253,6 +270,7 @@ def test_user_form_constraints(self):
'password1': self.users_password,
'password2': self.users_password,
'username': 'editor1_test_constraint',
'is_active': True,
'is_superuser': False,
'is_staff': False,
'groups': [],
Expand All @@ -272,6 +290,7 @@ def test_user_form_constraints(self):
'password1': self.users_password,
'password2': self.users_password,
'username': 'editor1_test_constraint',
'is_active': 'on',
'is_superuser': 'on',
'is_staff': 'off',
'groups': [],
Expand All @@ -286,6 +305,7 @@ def test_user_form_constraints(self):
'password1': self.users_password,
'password2': self.users_password,
'username': 'editor1_test_constraint',
'is_active': 'on',
'is_superuser': 'off',
'is_staff': 'on',
'groups': [],
Expand All @@ -300,6 +320,7 @@ def test_user_form_constraints(self):
'password1': self.users_password,
'password2': self.users_password,
'username': 'editor1_test_constraint',
'is_active': 'on',
'is_superuser': 'on',
'is_staff': 'on',
'groups': [],
Expand All @@ -319,6 +340,7 @@ def test_user_form_constraints(self):
'password1': self.users_password,
'password2': self.users_password,
'username': 'editor1_test_constraint',
'is_active': True,
'is_superuser': False,
'is_staff': False,
'groups': [self.main_roles[G3W_EDITOR1].pk, self.main_roles[G3W_EDITOR2].pk],
Expand Down
Loading