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

fix: 修复迁移数据库应用账号缺少的问题

pull/9586/head
Bai 2023-02-16 14:58:42 +08:00 committed by Jiangjie.Bai
parent b8c872c68e
commit bfa2e285f5
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/terminal/models/component/storage.py
View File

@ -77,6 +77,11 @@ class CommandStorage(CommonStorageModelMixin, JMSBaseModel):
def config(self): def config(self):
config = self.meta config = self.meta
config.update({'TYPE': self.type}) config.update({'TYPE': self.type})
# 处理 hosts 对象, 正常应该是list, 但是有时候是 str, debug 未果
hosts = config.get('HOSTS', [])
if isinstance(hosts, str) and ',' in hosts:
hosts = hosts.split(',')
config['HOSTS'] = hosts
return copy.deepcopy(config) return copy.deepcopy(config)
@property @property

3
apps/terminal/serializers/storage.py
View File

@ -178,7 +178,6 @@ command_storage_type_serializer_classes_mapping = {
# BaseStorageSerializer # BaseStorageSerializer
class BaseStorageSerializer(serializers.ModelSerializer): class BaseStorageSerializer(serializers.ModelSerializer):
type = LabeledChoiceField(choices=const.ReplayStorageType.choices, label=_('Type'))
storage_type_serializer_classes_mapping = {} storage_type_serializer_classes_mapping = {}
meta = MethodSerializer() meta = MethodSerializer()
@ -222,6 +221,7 @@ class BaseStorageSerializer(serializers.ModelSerializer):
# CommandStorageSerializer # CommandStorageSerializer
class CommandStorageSerializer(BaseStorageSerializer): class CommandStorageSerializer(BaseStorageSerializer):
type = LabeledChoiceField(choices=const.CommandStorageType.choices, label=_('Type'))
storage_type_serializer_classes_mapping = command_storage_type_serializer_classes_mapping storage_type_serializer_classes_mapping = command_storage_type_serializer_classes_mapping
class Meta(BaseStorageSerializer.Meta): class Meta(BaseStorageSerializer.Meta):
@ -233,6 +233,7 @@ class CommandStorageSerializer(BaseStorageSerializer):
# ReplayStorageSerializer # ReplayStorageSerializer
class ReplayStorageSerializer(BaseStorageSerializer): class ReplayStorageSerializer(BaseStorageSerializer):
type = LabeledChoiceField(choices=const.ReplayStorageType.choices, label=_('Type'))
storage_type_serializer_classes_mapping = replay_storage_type_serializer_classes_mapping storage_type_serializer_classes_mapping = replay_storage_type_serializer_classes_mapping
class Meta(BaseStorageSerializer.Meta): class Meta(BaseStorageSerializer.Meta):