mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Fixes #3106: Restrict queryset of chained fields when form validation fails

Browse Source
This commit is contained in:
Jeremy Stretch
2019-12-31 12:41:02 -05:00
parent 5caa04ef2b
commit f649b9f04f
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-2.6.md
View File

@ -8,6 +8,7 @@
## Bug Fixes ## Bug Fixes
* [#3106](https://github.com/netbox-community/netbox/issues/3106) - Restrict queryset of chained fields when form validation fails
* [#3695](https://github.com/netbox-community/netbox/issues/3695) - Include A/Z termination sites for circuits in global search * [#3695](https://github.com/netbox-community/netbox/issues/3695) - Include A/Z termination sites for circuits in global search
* [#3712](https://github.com/netbox-community/netbox/issues/3712) - Scrolling to target (hash) did not account for the header size * [#3712](https://github.com/netbox-community/netbox/issues/3712) - Scrolling to target (hash) did not account for the header size
* [#3780](https://github.com/netbox-community/netbox/issues/3780) - Fix AttributeError exception in API docs * [#3780](https://github.com/netbox-community/netbox/issues/3780) - Fix AttributeError exception in API docs

8
netbox/utilities/forms.py
View File

@ -701,16 +701,22 @@ class ChainedFieldsMixin(forms.BaseForm):
else: else:
break break
# Limit field queryset by chained field values
if filters_dict: if filters_dict:
field.queryset = field.queryset.filter(**filters_dict) field.queryset = field.queryset.filter(**filters_dict)
# Editing an existing instance; limit field to its current value
elif not self.is_bound and getattr(self, 'instance', None) and hasattr(self.instance, field_name): elif not self.is_bound and getattr(self, 'instance', None) and hasattr(self.instance, field_name):
obj = getattr(self.instance, field_name) obj = getattr(self.instance, field_name)
if obj is not None: if obj is not None:
field.queryset = field.queryset.filter(pk=obj.pk) field.queryset = field.queryset.filter(pk=obj.pk)
else: else:
field.queryset = field.queryset.none() field.queryset = field.queryset.none()
elif not self.is_bound: # Creating a new instance with no bound data; nullify queryset
elif not self.data.get(field_name):
field.queryset = field.queryset.none() field.queryset = field.queryset.none()
# Creating a new instance with bound data; limit queryset to the specified value
else:
field.queryset = field.queryset.filter(pk=self.data.get(field_name))
class ReturnURLForm(forms.Form): class ReturnURLForm(forms.Form):