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 #6892: Fix validation of unit ranges when creating a rack reservation

Browse Source
This commit is contained in:
jeremystretch
2021-08-05 11:12:08 -04:00
parent ee8fd701ae
commit 46d0af6cef
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-2.11.md
View File

@ -9,6 +9,7 @@
### Bug Fixes ### Bug Fixes
* [#6740](https://github.com/netbox-community/netbox/issues/6740) - Add import button to VM interfaces list * [#6740](https://github.com/netbox-community/netbox/issues/6740) - Add import button to VM interfaces list
* [#6892](https://github.com/netbox-community/netbox/issues/6892) - Fix validation of unit ranges when creating a rack reservation
--- ---

7
netbox/utilities/forms/utils.py
View File

@ -32,7 +32,10 @@ def parse_numeric_range(string, base=10):
begin, end = dash_range.split('-') begin, end = dash_range.split('-')
except ValueError: except ValueError:
begin, end = dash_range, dash_range begin, end = dash_range, dash_range
begin, end = int(begin.strip(), base=base), int(end.strip(), base=base) + 1 try:
begin, end = int(begin.strip(), base=base), int(end.strip(), base=base) + 1
except ValueError:
raise forms.ValidationError(f'Range "{dash_range}" is invalid.')
values.extend(range(begin, end)) values.extend(range(begin, end))
return list(set(values)) return list(set(values))
@ -64,7 +67,7 @@ def parse_alphanumeric_range(string):
else: else:
# Not a valid range (more than a single character) # Not a valid range (more than a single character)
if not len(begin) == len(end) == 1: if not len(begin) == len(end) == 1:
raise forms.ValidationError('Range "{}" is invalid.'.format(dash_range)) raise forms.ValidationError(f'Range "{dash_range}" is invalid.')
for n in list(range(ord(begin), ord(end) + 1)): for n in list(range(ord(begin), ord(end) + 1)):
values.append(chr(n)) values.append(chr(n))
return values return values