mirror of https://github.com/jumpserver/jumpserver
fix: 有默认值 required 为false
parent
4311e52681
commit
11464151e2
|
@ -55,12 +55,8 @@ class BasePlaybookManager:
|
|||
return {}
|
||||
|
||||
data = self.params.get(method_id)
|
||||
default_data = serializer().data
|
||||
if not data:
|
||||
data = automation_params.get(method_id, default_data)
|
||||
|
||||
for k, v in default_data.items():
|
||||
data.setdefault(k, v)
|
||||
data = automation_params.get(method_id, {})
|
||||
|
||||
params = serializer(data).data
|
||||
return {
|
||||
|
|
|
@ -51,8 +51,8 @@ def create_serializer_class(serializer_name, fields_info):
|
|||
field_type = data.pop('type', 'str')
|
||||
|
||||
# 用户定义 default 和 required 可能会冲突, 所以要处理一下
|
||||
default = data.get('default', '')
|
||||
if default not in ['', None]:
|
||||
default = data.get('default')
|
||||
if default is not None:
|
||||
data['required'] = False
|
||||
else:
|
||||
data.pop('default', None)
|
||||
|
|
Loading…
Reference in New Issue