Merge v2.9.4 release

netbox/extras/api/serializers.py

@@ -57,24 +57,30 @@ class TaggedObjectSerializer(serializers.Serializer):
     tags = NestedTagSerializer(many=True, required=False)
 
     def create(self, validated_data):
-        tags = validated_data.pop('tags', [])
+        tags = validated_data.pop('tags', None)
         instance = super().create(validated_data)
 
-        return self._save_tags(instance, tags)
+        if tags is not None:
+            return self._save_tags(instance, tags)
+        return instance
 
     def update(self, instance, validated_data):
-        tags = validated_data.pop('tags', [])
+        tags = validated_data.pop('tags', None)
 
         # Cache tags on instance for change logging
-        instance._tags = tags
+        instance._tags = tags or []
 
         instance = super().update(instance, validated_data)
 
-        return self._save_tags(instance, tags)
+        if tags is not None:
+            return self._save_tags(instance, tags)
+        return instance
 
     def _save_tags(self, instance, tags):
         if tags:
             instance.tags.set(*[t.name for t in tags])
+        else:
+            instance.tags.clear()
 
         return instance