NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-01-25 04:50:00 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'develop' into develop-2.2

Browse Source 
Conflicts:
	netbox/dcim/forms.py
This commit is contained in:
Jeremy Stretch
2017-09-14 14:58:45 -04:00
parent 0d8947bf36 5c8213f423
commit fcc8f7e076
4 changed files with 40 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
netbox/ipam/forms.py
View File

@@ -25,11 +25,8 @@ IP_FAMILY_CHOICES = [
(6, 'IPv6'),
]
PREFIX_MASK_LENGTH_CHOICES = [
('', '---------'),
] + [(i, i) for i in range(1, 128)]
IPADDRESS_MASK_LENGTH_CHOICES = PREFIX_MASK_LENGTH_CHOICES + [(128, 128)]
PREFIX_MASK_LENGTH_CHOICES = add_blank_choice([(i, i) for i in range(1, 128)])
IPADDRESS_MASK_LENGTH_CHOICES = add_blank_choice([(i, i) for i in range(1, 129)])
#