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

Fix bug with numbers >10

Browse Source
This commit is contained in:
Ryan Breaker
2017-10-31 22:03:57 -05:00
parent e57b8aa26f
commit 57973f62c5
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
netbox/utilities/forms.py
View File

@ -88,17 +88,18 @@ def parse_alphanumeric_range(string):
for dash_range in string.split(','): for dash_range in string.split(','):
try: try:
begin, end = dash_range.split('-') begin, end = dash_range.split('-')
# Skip if incompatible types or mixed case, just like any other bad pattern
vals = begin + end vals = begin + end
if not (vals.isdigit() or vals.isalpha()): # Break out of loop if there's an invalid pattern to return an error
continue if (not (vals.isdigit() or vals.isalpha())) or (vals.isalpha() and not (vals.isupper() or vals.islower())):
if vals.isalpha() and not (vals.isupper() or vals.islower()): return []
continue
except ValueError: except ValueError:
begin, end = dash_range, dash_range begin, end = dash_range, dash_range
nums = list(range(ord(begin), ord(end) + 1)) if begin.isdigit() and end.isdigit():
for n in nums: for n in list(range(int(begin), int(end) + 1)):
values.append(chr(n)) values.append(n)
else:
for n in list(range(ord(begin), ord(end) + 1)):
values.append(chr(n))
return values return values