NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-27 02:48:38 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix issues failing CI

Browse Source
This commit is contained in:
Gelob 2016-07-06 03:28:39 -04:00
parent 4ea70763e1
commit 4eee663895
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/ipam/forms.py
View File

@ -240,10 +240,12 @@ def prefix_site_choices():
site_choices = Site.objects.annotate(prefix_count=Count('prefixes')) site_choices = Site.objects.annotate(prefix_count=Count('prefixes'))
return [(s.slug, '{} ({})'.format(s.name, s.prefix_count)) for s in site_choices] return [(s.slug, '{} ({})'.format(s.name, s.prefix_count)) for s in site_choices]
def prefix_vlan_choices(): def prefix_vlan_choices():
vlan_choices = VLAN.objects.annotate(prefix_count=Count('prefixes')) vlan_choices = VLAN.objects.annotate(prefix_count=Count('prefixes'))
return [(v.id, '{} ({})'.format(v.display_name, v.prefix_count)) for v in vlan_choices] return [(v.id, '{} ({})'.format(v.display_name, v.prefix_count)) for v in vlan_choices]
def prefix_status_choices(): def prefix_status_choices():
status_counts = {} status_counts = {}
for status in Prefix.objects.values('status').annotate(count=Count('status')).order_by('status'): for status in Prefix.objects.values('status').annotate(count=Count('status')).order_by('status'):
@ -262,8 +264,8 @@ class PrefixFilterForm(forms.Form, BootstrapMixin):
status = forms.MultipleChoiceField(required=False, choices=prefix_status_choices) status = forms.MultipleChoiceField(required=False, choices=prefix_status_choices)
site = forms.MultipleChoiceField(required=False, choices=prefix_site_choices, site = forms.MultipleChoiceField(required=False, choices=prefix_site_choices,
widget=forms.SelectMultiple(attrs={'size': 6})) widget=forms.SelectMultiple(attrs={'size': 6}))
vlan_id = forms.MultipleChoiceField(required=False, choices=prefix_vlan_choices, label='VLAN', vlan_id = forms.MultipleChoiceField(required=False, choices=prefix_vlan_choices,
widget=forms.SelectMultiple(attrs={'size': 8})) label='VLAN', widget=forms.SelectMultiple(attrs={'size': 8}))
role = forms.MultipleChoiceField(required=False, choices=prefix_role_choices, role = forms.MultipleChoiceField(required=False, choices=prefix_role_choices,
widget=forms.SelectMultiple(attrs={'size': 6})) widget=forms.SelectMultiple(attrs={'size': 6}))
expand = forms.BooleanField(required=False, label='Expand prefix hierarchy') expand = forms.BooleanField(required=False, label='Expand prefix hierarchy')