github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-06-29 16:27:11 +00:00
Code Issues Projects Releases Wiki Activity

fix: 修复工单复合通知无账号信息 (#11912)

Browse Source 
Co-authored-by: feng <1304903146@qq.com>
This commit is contained in:
fit2bot 2023-10-19 15:56:14 +08:00 committed by GitHub
parent 4aa4c6854b
commit db2331521d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/authentication/api/connection_token.py
View File

@ -330,13 +330,28 @@ class ConnectionTokenViewSet(ExtraActionApiMixin, RootOrgViewMixin, JMSModelView
connect_options[name] = value connect_options[name] = value
data['connect_options'] = connect_options data['connect_options'] = connect_options
@staticmethod
def get_input_username(data):
input_username = data.get('input_username', '')
if input_username:
return input_username
account = data.get('account', '')
if account == '@USER':
input_username = str(data.get('user', ''))
elif account == '@INPUT':
input_username = '@INPUT'
else:
input_username = account
return input_username
def validate_serializer(self, serializer): def validate_serializer(self, serializer):
data = serializer.validated_data data = serializer.validated_data
user = self.get_user(serializer) user = self.get_user(serializer)
self._insert_connect_options(data, user) self._insert_connect_options(data, user)
asset = data.get('asset') asset = data.get('asset')
account_name = data.get('account') account_name = data.get('account')
self.input_username = data.get('input_username', '') self.input_username = self.get_input_username(data)
_data = self._validate(user, asset, account_name) _data = self._validate(user, asset, account_name)
data.update(_data) data.update(_data)
return serializer return serializer