NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-09 00:58:16 -06:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

9627 fixes

Browse Source
This commit is contained in:
Arthur Hanson 2024-06-21 13:08:56 -07:00
parent 35d7ba113f
commit 35a5165c87
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/utilities/data.py
View File

@ -125,7 +125,7 @@ def check_ranges_overlap(ranges):
ranges.sort(key=lambda x: x.lower) ranges.sort(key=lambda x: x.lower)
for i in range(1, len(ranges)): for i in range(1, len(ranges)):
if (ranges[i - 1].upper > ranges[i].lower): if (ranges[i - 1].upper >= ranges[i].lower):
return True return True
return False return False

4
netbox/utilities/forms/fields/array.py
View File

@ -43,11 +43,13 @@ class NumericRangeArrayField(forms.CharField):
) )
def prepare_value(self, value): def prepare_value(self, value):
if isinstance(value, str):
return value
return ','.join([f"{val.lower}-{val.upper}" for val in value]) return ','.join([f"{val.lower}-{val.upper}" for val in value])
def to_python(self, value): def to_python(self, value):
if not value: if not value:
return '' return None
ranges = value.split(",") ranges = value.split(",")
values = [] values = []
for dash_range in value.split(','): for dash_range in value.split(','):