NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-25 16:56:10 -06:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

12589 fix for Objectchange

Browse Source
This commit is contained in:
Arthur 2023-06-20 17:12:43 -07:00
parent 39608f6d83
commit 8267ca5840
2 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
netbox/users/forms/model_forms.py
View File

@ -201,6 +201,11 @@ class UserForm(BootstrapMixin, forms.ModelForm):
del self.fields['date_joined'] del self.fields['date_joined']
del self.fields['last_login'] del self.fields['last_login']
# def is_valid(self):
# ret = super().is_valid()
# breakpoint()
# return ret
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
instance = super().save(*args, **kwargs) instance = super().save(*args, **kwargs)
instance.object_permissions.set(self.cleaned_data['object_permissions']) instance.object_permissions.set(self.cleaned_data['object_permissions'])
@ -215,9 +220,27 @@ class UserForm(BootstrapMixin, forms.ModelForm):
if password != confirm_password: if password != confirm_password:
raise forms.ValidationError( raise forms.ValidationError(
"password and confirm_password does not match" _("password and confirm_password does not match")
) )
def clean_username(self):
"""Reject usernames that differ only in case."""
instance = getattr(self, 'instance', None)
if instance:
qs = self._meta.model.objects.exclude(pk=instance.pk)
else:
qs = self._meta.model.objects.all()
username = self.cleaned_data.get("username")
if (
username and qs.filter(username__iexact=username).exists()
):
raise forms.ValidationError(
_("user with this username already exists")
)
return username
class GroupForm(BootstrapMixin, forms.ModelForm): class GroupForm(BootstrapMixin, forms.ModelForm):
users = DynamicModelMultipleChoiceField( users = DynamicModelMultipleChoiceField(

30
netbox/utilities/testing/views.py
View File

@ -170,13 +170,14 @@ class ViewTestCases:
instance = self._get_queryset().order_by('pk').last() instance = self._get_queryset().order_by('pk').last()
self.assertInstanceEqual(instance, self.form_data) self.assertInstanceEqual(instance, self.form_data)
# Verify ObjectChange creation if hasattr(self.model, "to_objectchange"):
objectchanges = ObjectChange.objects.filter( # Verify ObjectChange creation
changed_object_type=ContentType.objects.get_for_model(instance), objectchanges = ObjectChange.objects.filter(
changed_object_id=instance.pk changed_object_type=ContentType.objects.get_for_model(instance),
) changed_object_id=instance.pk
self.assertEqual(len(objectchanges), 1) )
self.assertEqual(objectchanges[0].action, ObjectChangeActionChoices.ACTION_CREATE) self.assertEqual(len(objectchanges), 1)
self.assertEqual(objectchanges[0].action, ObjectChangeActionChoices.ACTION_CREATE)
@override_settings(EXEMPT_VIEW_PERMISSIONS=['*']) @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
def test_create_object_with_constrained_permission(self): def test_create_object_with_constrained_permission(self):
@ -263,13 +264,14 @@ class ViewTestCases:
self.assertHttpStatus(self.client.post(**request), 302) self.assertHttpStatus(self.client.post(**request), 302)
self.assertInstanceEqual(self._get_queryset().get(pk=instance.pk), self.form_data) self.assertInstanceEqual(self._get_queryset().get(pk=instance.pk), self.form_data)
# Verify ObjectChange creation if hasattr(self.model, "to_objectchange"):
objectchanges = ObjectChange.objects.filter( # Verify ObjectChange creation
changed_object_type=ContentType.objects.get_for_model(instance), objectchanges = ObjectChange.objects.filter(
changed_object_id=instance.pk changed_object_type=ContentType.objects.get_for_model(instance),
) changed_object_id=instance.pk
self.assertEqual(len(objectchanges), 1) )
self.assertEqual(objectchanges[0].action, ObjectChangeActionChoices.ACTION_UPDATE) self.assertEqual(len(objectchanges), 1)
self.assertEqual(objectchanges[0].action, ObjectChangeActionChoices.ACTION_UPDATE)
@override_settings(EXEMPT_VIEW_PERMISSIONS=['*']) @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
def test_edit_object_with_constrained_permission(self): def test_edit_object_with_constrained_permission(self):