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

Merge pull request #11002 from jumpserver/pr@v2.28@ticket 

fix: 工单时区问题 rdp文件添加disableconnectionsharing 参数
pull/11623/head
老广 2023-07-18 18:15:50 +08:00 committed by GitHub
parent 0132eafeb6 3b92e9e516
commit d5a9942159
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,6 +125,7 @@ class ConnectionTokenMixin:
'bookmarktype:i': '3', 'bookmarktype:i': '3',
'use redirection server name:i': '0', 'use redirection server name:i': '0',
'smart sizing:i': '1', 'smart sizing:i': '1',
'disableconnectionsharing:i': '1',
# 'drivestoredirect:s': '*', # 'drivestoredirect:s': '*',
# 'domain:s': '' # 'domain:s': ''
# 'alternate shell:s:': '||MySQLWorkbench', # 'alternate shell:s:': '||MySQLWorkbench',

4
apps/tickets/serializers/ticket/common.py
View File

@ -1,5 +1,5 @@
from django.db.transaction import atomic
from django.db.models import Model from django.db.models import Model
from django.db.transaction import atomic
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from rest_framework import serializers from rest_framework import serializers
@ -69,8 +69,6 @@ class BaseApplyAssetApplicationSerializer(serializers.Serializer):
error = _('The expiration date should be greater than the start date') error = _('The expiration date should be greater than the start date')
raise serializers.ValidationError({'apply_date_expired': error}) raise serializers.ValidationError({'apply_date_expired': error})
attrs['apply_date_start'] = apply_date_start
attrs['apply_date_expired'] = apply_date_expired
return attrs return attrs
@atomic @atomic