mirror of https://github.com/jumpserver/jumpserver
fix: 修复创建授权规则时不包含actions报错的问题
parent
2a8d63e9cd
commit
21d24ae4bc
|
@ -4,7 +4,7 @@ import six
|
||||||
from django.core.exceptions import ObjectDoesNotExist
|
from django.core.exceptions import ObjectDoesNotExist
|
||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
from rest_framework import serializers
|
from rest_framework import serializers
|
||||||
from rest_framework.fields import ChoiceField
|
from rest_framework.fields import ChoiceField, empty
|
||||||
|
|
||||||
from common.db.fields import BitChoices
|
from common.db.fields import BitChoices
|
||||||
from common.utils import decrypt_password
|
from common.utils import decrypt_password
|
||||||
|
@ -153,3 +153,15 @@ class BitChoicesField(TreeChoicesMixin, serializers.MultipleChoiceField):
|
||||||
raise serializers.ValidationError(_("Invalid choice: {}").format(name))
|
raise serializers.ValidationError(_("Invalid choice: {}").format(name))
|
||||||
value |= name_value_map[name]
|
value |= name_value_map[name]
|
||||||
return value
|
return value
|
||||||
|
|
||||||
|
def run_validation(self, data=empty):
|
||||||
|
"""
|
||||||
|
备注:
|
||||||
|
创建授权规则不包含 actions 字段时, 会使用默认值(AssetPermission 中设置),
|
||||||
|
会直接使用 ['connect', '...'] 等字段保存到数据库,导致类型错误
|
||||||
|
这里将获取到的值再执行一下 to_internal_value 方法, 转化为内部值
|
||||||
|
"""
|
||||||
|
data = super().run_validation(data)
|
||||||
|
value = self.to_internal_value(data)
|
||||||
|
self.run_validators(value)
|
||||||
|
return value
|
||||||
|
|
Loading…
Reference in New Issue