From 674907ce0fd2ae759f441e11e0d285bd66020635 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Sat, 13 Jul 2024 11:24:03 -0400 Subject: [PATCH] Misc cleanup --- netbox/utilities/data.py | 7 ++----- netbox/utilities/forms/fields/array.py | 11 +++++------ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/netbox/utilities/data.py b/netbox/utilities/data.py index d6d889694..ad3e05abd 100644 --- a/netbox/utilities/data.py +++ b/netbox/utilities/data.py @@ -138,12 +138,9 @@ def ranges_to_string(ranges): """ Generate a human-friendly string from a set of ranges. Intended for use with ArrayField. For example: - [1-100, 200-300] => "1-100, 200-300" + [Range(1, 100), Range(200, 300)] => "1-100, 200-300" """ - if not ranges: - return "" - - return ', '.join([f"{val.lower}-{val.upper}" for val in ranges]) + return ', '.join([f"{r.lower}-{r.upper}" for r in ranges]) def string_to_range_array(value): diff --git a/netbox/utilities/forms/fields/array.py b/netbox/utilities/forms/fields/array.py index 5dde6b101..eef85672b 100644 --- a/netbox/utilities/forms/fields/array.py +++ b/netbox/utilities/forms/fields/array.py @@ -34,18 +34,17 @@ class NumericRangeArrayField(forms.CharField): A field which allows for array of numeric ranges: Example: 1-5,7-20,30-50 """ - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - if not self.help_text: - self.help_text = mark_safe( + def __init__(self, *args, help_text='', **kwargs): + if not help_text: + help_text = mark_safe( _("Specify one or more numeric ranges separated by commas. Example: " + "1-5,20-30") ) + super().__init__(*args, help_text=help_text, **kwargs) def clean(self, value): if value and not self.to_python(value): raise forms.ValidationError( - _("Invalid ranges ({value}). Must be range of number '100-200' and ranges must be in ascending order.").format(value=value) + _("Invalid ranges ({value}). Must be a range of integers in ascending order.").format(value=value) ) return super().clean(value)