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 #1265: Fix console/power/interface connection validation when selecting a device via live search

Browse Source
This commit is contained in:
Jeremy Stretch
2017-06-14 13:00:36 -04:00
parent 78d74261e9
commit fcacac7c6f
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
netbox/dcim/forms.py
View File

@ -1594,9 +1594,10 @@ class InterfaceConnectionForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelFor
] ]
# Mark connected interfaces as disabled # Mark connected interfaces as disabled
self.fields['interface_b'].choices = [ if self.data.get('device_b'):
(iface.id, {'label': iface.name, 'disabled': iface.is_connected}) for iface in self.fields['interface_b'].queryset self.fields['interface_b'].choices = [
] (iface.id, {'label': iface.name, 'disabled': iface.is_connected}) for iface in self.fields['interface_b'].queryset
]
class InterfaceConnectionCSVForm(forms.ModelForm): class InterfaceConnectionCSVForm(forms.ModelForm):

3
netbox/project-static/js/livesearch.js
View File

@ -43,8 +43,9 @@ $(document).ready(function() {
real_field.empty(); real_field.empty();
real_field.append($("<option></option>").attr('value', ui.item.value).text(ui.item.label)); real_field.append($("<option></option>").attr('value', ui.item.value).text(ui.item.label));
real_field.change(); real_field.change();
// If the field has a parent helper, reset the parent to no selection // Disable parent selection fields
$('select[filter-for="' + real_field.attr('name') + '"]').val(''); $('select[filter-for="' + real_field.attr('name') + '"]').val('');
$('#select select').attr('disabled', 'disabled');
}, },
minLength: 4, minLength: 4,
delay: 500 delay: 500

3
netbox/utilities/forms.py
View File

@ -472,6 +472,9 @@ 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):