github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: Removing labels from asset details will cause an error.

pull/14897/head
wangruidong 2025-02-17 18:06:49 +08:00 committed by w940853815
parent 363bb20da7
commit 046a9d41bf
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/common/serializers/fields.py
View File

@ -8,7 +8,7 @@ from rest_framework import serializers
from rest_framework.fields import ChoiceField, empty from rest_framework.fields import ChoiceField, empty
from common.db.fields import TreeChoices, JSONManyToManyField as ModelJSONManyToManyField from common.db.fields import TreeChoices, JSONManyToManyField as ModelJSONManyToManyField
from common.utils import decrypt_password from common.utils import decrypt_password, is_uuid
__all__ = [ __all__ = [
"ReadableHiddenField", "ReadableHiddenField",
@ -127,12 +127,14 @@ class LabelRelatedField(serializers.RelatedField):
if isinstance(data, dict) and (data.get("id") or data.get("pk")): if isinstance(data, dict) and (data.get("id") or data.get("pk")):
pk = data.get("id") or data.get("pk") pk = data.get("id") or data.get("pk")
label = Label.objects.get(pk=pk) label = Label.objects.get(pk=pk)
elif is_uuid(data):
label = Label.objects.get(pk=data)
else: else:
if isinstance(data, dict): if isinstance(data, dict):
k = data.get("name") k = data.get("name")
v = data.get("value") v = data.get("value")
elif isinstance(data, str) and ":" in data: elif isinstance(data, str) and ":" in data:
k, v = data.split(":", 1) k, v = [x.strip() for x in data.split(":", 1)]
else: else:
raise serializers.ValidationError(_("Invalid data type")) raise serializers.ValidationError(_("Invalid data type"))
label, __ = Label.objects.get_or_create(name=k, value=v, defaults={'name': k, 'value': v}) label, __ = Label.objects.get_or_create(name=k, value=v, defaults={'name': k, 'value': v})