Merge v2.9.4 release

netbox/utilities/forms/widgets.py

@@ -141,7 +141,7 @@ class APISelect(SelectWithDisabled):
         key = f'data-query-param-{name}'
 
         values = json.loads(self.attrs.get(key, '[]'))
-        if type(value) is list:
+        if type(value) in (list, tuple):
             values.extend([str(v) for v in value])
         else:
             values.append(str(value))

netbox/utilities/tables.py

@@ -114,12 +114,12 @@ class BooleanColumn(tables.Column):
     character.
     """
     def render(self, value):
-        if value is True:
+        if value:
             rendered = '<span class="text-success"><i class="fa fa-check"></i></span>'
-        elif value is False:
-            rendered = '<span class="text-danger"><i class="fa fa-close"></i></span>'
-        else:
+        elif value is None:
             rendered = '<span class="text-muted">&mdash;</span>'
+        else:
+            rendered = '<span class="text-danger"><i class="fa fa-close"></i></span>'
         return mark_safe(rendered)
 
 

netbox/utilities/testing/api.py

@@ -267,7 +267,7 @@ class APIViewTestCases:
             response = self.client.patch(url, update_data, format='json', **self.header)
             self.assertHttpStatus(response, status.HTTP_200_OK)
             instance.refresh_from_db()
-            self.assertInstanceEqual(instance, self.update_data, api=True)
+            self.assertInstanceEqual(instance, update_data, api=True)
 
         def test_bulk_update_objects(self):
             """

netbox/utilities/views.py

@@ -936,7 +936,7 @@ class BulkEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
 
                                 # ManyToManyFields
                                 elif isinstance(model_field, ManyToManyField):
-                                    if form.cleaned_data[name].count() > 0:
+                                    if form.cleaned_data[name]:
                                         getattr(obj, name).set(form.cleaned_data[name])
                                 # Normal fields
                                 elif form.cleaned_data[name] not in (None, ''):