NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-18 04:56:29 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fixes #1289: Retain inside NAT assignment when editing an IP address

Browse Source
This commit is contained in:
Jeremy Stretch 2017-07-05 14:29:40 -04:00
parent 5233463f0b
commit 14f5204548
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
netbox/utilities/forms.py
View File

@ -472,9 +472,6 @@ class ChainedFieldsMixin(forms.BaseForm):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(ChainedFieldsMixin, self).__init__(*args, **kwargs) super(ChainedFieldsMixin, self).__init__(*args, **kwargs)
# if self.is_bound:
# assert False, self.data
for field_name, field in self.fields.items(): for field_name, field in self.fields.items():
if isinstance(field, ChainedModelChoiceField): if isinstance(field, ChainedModelChoiceField):
@ -492,6 +489,12 @@ class ChainedFieldsMixin(forms.BaseForm):
if filters_dict: if filters_dict:
field.queryset = field.queryset.filter(**filters_dict) field.queryset = field.queryset.filter(**filters_dict)
elif not self.is_bound and self.instance and hasattr(self.instance, field_name):
obj = getattr(self.instance, field_name)
if obj is not None:
field.queryset = field.queryset.filter(pk=obj.pk)
else:
field.queryset = field.queryset.none()
elif not self.is_bound: elif not self.is_bound:
field.queryset = field.queryset.none() field.queryset = field.queryset.none()