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

fix: 有默认值 required 为false

pull/10909/head
feng 2023-07-05 14:22:27 +08:00 committed by Bryan
parent 4311e52681
commit 11464151e2
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/assets/automations/base/manager.py
View File

@ -55,12 +55,8 @@ class BasePlaybookManager:
return {} return {}
data = self.params.get(method_id) data = self.params.get(method_id)
default_data = serializer().data
if not data: if not data:
data = automation_params.get(method_id, default_data) data = automation_params.get(method_id, {})
for k, v in default_data.items():
data.setdefault(k, v)
params = serializer(data).data params = serializer(data).data
return { return {

4
apps/common/serializers/dynamic.py
View File

@ -51,8 +51,8 @@ def create_serializer_class(serializer_name, fields_info):
field_type = data.pop('type', 'str') field_type = data.pop('type', 'str')
# 用户定义 default 和 required 可能会冲突, 所以要处理一下 # 用户定义 default 和 required 可能会冲突, 所以要处理一下
default = data.get('default', '') default = data.get('default')
if default not in ['', None]: if default is not None:
data['required'] = False data['required'] = False
else: else:
data.pop('default', None) data.pop('default', None)