NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-24 17:38:37 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge pull request #1327 from digitalocean/develop

Browse Source 
Release v2.0.9
This commit is contained in:
Jeremy Stretch 2017-07-10 09:43:59 -04:00 committed by GitHub
commit e05d379101
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/data-model/extras.md
View File

@ -119,7 +119,7 @@ Each line of the **device patterns** field represents a hierarchical layer withi
``` ```
core-switch-[abcd] core-switch-[abcd]
dist-switch\d dist-switch\d
access-switch\d+,oob-switch\d+ access-switch\d+;oob-switch\d+
``` ```
Note that you can combine multiple regexes onto one line using semicolons. The order in which regexes are listed on a line is significant: devices matching the first regex will be rendered first, and subsequent groups will be rendered to the right of those. Note that you can combine multiple regexes onto one line using semicolons. The order in which regexes are listed on a line is significant: devices matching the first regex will be rendered first, and subsequent groups will be rendered to the right of those.

11
netbox/circuits/forms.py
View File

@ -252,6 +252,11 @@ class CircuitTerminationForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelForm
super(CircuitTerminationForm, self).__init__(*args, **kwargs) super(CircuitTerminationForm, self).__init__(*args, **kwargs)
# Mark connected interfaces as disabled # Mark connected interfaces as disabled
self.fields['interface'].choices = [ self.fields['interface'].choices = []
(iface.id, {'label': iface.name, 'disabled': iface.is_connected}) for iface in self.fields['interface'].queryset for iface in self.fields['interface'].queryset:
] self.fields['interface'].choices.append(
(iface.id, {
'label': iface.name,
'disabled': iface.is_connected and iface.pk != self.initial.get('interface'),
})
)

2
netbox/netbox/settings.py
View File

@ -13,7 +13,7 @@ except ImportError:
) )
VERSION = '2.0.8' VERSION = '2.0.9'
# Import required configuration parameters # Import required configuration parameters
ALLOWED_HOSTS = DATABASE = SECRET_KEY = None ALLOWED_HOSTS = DATABASE = SECRET_KEY = None

2
netbox/utilities/forms.py
View File

@ -489,7 +489,7 @@ 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): 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)