Merge branch 'develop' into 10170-changelog

netbox/dcim/svg/cables.py

@@ -94,7 +94,7 @@ class Connector(Group):
         self.add(cable)
 
         # Add link
-        link = Hyperlink(href=url, target='_blank')
+        link = Hyperlink(href=url, target='_parent')
 
         # Add text label(s)
         cursor = start[1]
@@ -281,7 +281,7 @@ class CableTraceSVG:
         self.cursor += PADDING * 2
 
         # Add link
-        link = Hyperlink(href=f'{self.base_url}{wirelesslink.get_absolute_url()}', target='_blank')
+        link = Hyperlink(href=f'{self.base_url}{wirelesslink.get_absolute_url()}', target='_parent')
 
         # Add text label(s)
         for i, label in enumerate(labels):

netbox/dcim/svg/racks.py

@@ -151,7 +151,7 @@ class RackElevationSVG:
         css_extra = ' shaded' if is_shaded else ''
 
         # Create hyperlink element
-        link = Hyperlink(href=f'{self.base_url}{device.get_absolute_url()}', target='_blank')
+        link = Hyperlink(href=f'{self.base_url}{device.get_absolute_url()}', target="_parent")
         link.set_desc(description)
 
         # Add rect element to hyperlink
@@ -235,10 +235,7 @@ class RackElevationSVG:
                     self.margin_width,
                     u_height * self.unit_height
                 )
-                link = Hyperlink(
-                    href='{}{}'.format(self.base_url, reservation.get_absolute_url()),
-                    target='_blank'
-                )
+                link = Hyperlink(href=f'{self.base_url}{reservation.get_absolute_url()}', target='_parent')
                 link.set_desc(f'Reservation #{reservation.pk}: {reservation.description}')
                 link.add(
                     Rect(coords, size, class_='reservation')
@@ -268,7 +265,7 @@ class RackElevationSVG:
                 y_offset + self.unit_height / 2
             )
 
-            link = Hyperlink(href=url_string.format(unit), target='_blank')
+            link = Hyperlink(href=url_string.format(unit), target='_parent')
             link.add(Rect((x_offset, y_offset), (self.unit_width, self.unit_height), class_='slot'))
             link.add(Text('add device', insert=text_coords, class_='add-device'))
 

netbox/netbox/settings.py

@@ -535,6 +535,7 @@ REST_FRAMEWORK = {
     'DEFAULT_PAGINATION_CLASS': 'netbox.api.pagination.OptionalLimitOffsetPagination',
     'DEFAULT_PARSER_CLASSES': (
         'rest_framework.parsers.JSONParser',
+        'rest_framework.parsers.MultiPartParser',
     ),
     'DEFAULT_PERMISSION_CLASSES': (
         'netbox.api.authentication.TokenPermissions',

netbox/utilities/templates/form_helpers/render_custom_fields.html

@@ -7,6 +7,10 @@
   </div>
   {% endif %}
   {% for name in fields %}
-    {% render_field form|getfield:name %}
+    {% if name in form.nullable_fields %}
+      {% render_field form|getfield:name bulk_nullable=True %}
+    {% else %}
+      {% render_field form|getfield:name %}
+    {% endif %}
   {% endfor %}
 {% endfor %}