diff --git a/netbox/utilities/forms/fields.py b/netbox/utilities/forms/fields.py index a84ee6695..607f351a2 100644 --- a/netbox/utilities/forms/fields.py +++ b/netbox/utilities/forms/fields.py @@ -177,8 +177,12 @@ class MemoryField(forms.MultiValueField): def compress(cls, data): if data: size, unit = data - if size: + if size and not unit: + raise forms.ValidationError("Memory unit cannot be blank.") + elif size and unit: return size * cls.MULTIPLIERS[unit] + elif not size and unit: + raise forms.ValidationError("Please enter a memory value when unit is selected.") # diff --git a/netbox/utilities/templates/form_helpers/render_field.html b/netbox/utilities/templates/form_helpers/render_field.html index f32bffedc..64e5d6062 100644 --- a/netbox/utilities/templates/form_helpers/render_field.html +++ b/netbox/utilities/templates/form_helpers/render_field.html @@ -112,7 +112,7 @@ {{ field }} {% if bulk_nullable %}
- +
{% endif %}