Merge branch 'develop' into feature

netbox/utilities/custom_inspectors.py

@@ -28,13 +28,12 @@ class NetBoxSwaggerAutoSchema(SwaggerAutoSchema):
         serializer = super().get_request_serializer()
 
         if serializer is not None and self.method in self.implicit_body_methods:
-            writable_class = self.get_writable_class(serializer)
-            if writable_class is not None:
+            if writable_class := self.get_writable_class(serializer):
                 if hasattr(serializer, 'child'):
                     child_serializer = self.get_writable_class(serializer.child)
-                    serializer = writable_class(child=child_serializer)
+                    serializer = writable_class(context=serializer.context, child=child_serializer)
                 else:
-                    serializer = writable_class()
+                    serializer = writable_class(context=serializer.context)
         return serializer
 
     def get_writable_class(self, serializer):

netbox/utilities/serializers/json.py

@@ -0,0 +1,19 @@
+from django.contrib.postgres.fields import ArrayField
+from django.core.serializers.json import Serializer as Serializer_
+from django.utils.encoding import is_protected_type
+
+
+class Serializer(Serializer_):
+    """
+    Custom extension of Django's JSON serializer to support ArrayFields (see
+    https://code.djangoproject.com/ticket/33974).
+    """
+    def _value_from_field(self, obj, field):
+        value = field.value_from_object(obj)
+
+        # Handle ArrayFields of protected types
+        if type(field) is ArrayField:
+            if not value or is_protected_type(value[0]):
+                return value
+
+        return value if is_protected_type(value) else field.value_to_string(obj)

netbox/utilities/templates/form_helpers/render_field.html

@@ -8,7 +8,7 @@
             <div class="form-check{% if field.errors %} has-error{% endif %}">
                 {{ field }}
                 <label for="{{ field.id_for_label }}" class="form-check-label">
-                    {{ field.label }}
+                    {{ label }}
                 </label>
             </div>
             {% if field.help_text %}
@@ -23,7 +23,7 @@
         </div>
     </div>
 
-{% elif field|widget_type == 'textarea' and not field.label %}
+{% elif field|widget_type == 'textarea' and not label %}
     <div class="row mb-3">
         {% if label %}
         <label class="col-sm-3 col-form-label text-lg-end{% if field.field.required %} required{% endif %}" for="{{ field.id_for_label }}">
@@ -48,7 +48,7 @@
 {% elif field|widget_type == 'slugwidget' %}
     <div class="row mb-3">
         <label class="col-sm-3 col-form-label text-lg-end{% if field.field.required %} required{% endif %}" for="{{ field.id_for_label }}">
-            {{ field.label }}
+            {{ label }}
         </label>
         <div class="col">
             <div class="input-group">
@@ -71,13 +71,13 @@
         accept="{{ field.field.widget.attrs.accept }}"
         {% if field.is_required %}required{% endif %}
     />
-    <label for="{{ field.id_for_label }}" class="input-group-text">{{ field.label|bettertitle }}</label>
+    <label for="{{ field.id_for_label }}" class="input-group-text">{{ label|bettertitle }}</label>
   </div>
 
 {% elif field|widget_type == 'clearablefileinput' %}
     <div class="row mb-3">
         <label for="{{ field.id_for_label }}" class="form-label col col-md-3 text-lg-end{% if field.field.required %} required{% endif %}">
-            {{ field.label }}
+            {{ label }}
         </label>
         <div class="col col-md-9">
             {{ field }}
@@ -87,7 +87,7 @@
 {% elif field|widget_type == 'selectmultiple' %}
     <div class="row mb-3">
         <label for="{{ field.id_for_label }}" class="form-label col col-md-3 text-lg-end{% if field.field.required %} required{% endif %}">
-            {{ field.label }}
+            {{ label }}
         </label>
         <div class="col col-md-9">
             {{ field }}
@@ -103,7 +103,7 @@
 {% else %}
     <div class="row mb-3">
         <label for="{{ field.id_for_label }}" class="col-sm-3 col-form-label text-lg-end{% if field.field.required %} required{% endif %}">
-            {{ field.label }}
+            {{ label }}
         </label>
         <div class="col">
             {{ field }}
@@ -112,7 +112,7 @@
             {% endif %}
             <div class="invalid-feedback">
                 {% if field.field.required %}
-                    <strong>{{ field.label }}</strong> field is required.
+                    <strong>{{ label }}</strong> field is required.
                 {% endif %}
             </div>
             {% if bulk_nullable %}

netbox/utilities/templatetags/form_helpers.py

@@ -40,7 +40,7 @@ def render_field(field, bulk_nullable=False, label=None):
     """
     return {
         'field': field,
-        'label': label,
+        'label': label or field.label,
         'bulk_nullable': bulk_nullable,
     }