github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-07-04 18:46:39 +00:00
Code Issues Projects Releases Wiki Activity

perf: 支持持久化设置个人终端主题

Browse Source
This commit is contained in:
Eric 2023-10-09 15:40:54 +08:00 committed by Bryan
parent 11157563ba
commit d6c0139fef
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -314,12 +314,17 @@ class ConnectionTokenViewSet(ExtraActionApiMixin, RootOrgViewMixin, JMSModelView
return super().perform_create(serializer) return super().perform_create(serializer)
def _insert_connect_options(self, data, user): def _insert_connect_options(self, data, user):
name = 'file_name_conflict_resolution'
connect_options = data.pop('connect_options', {}) connect_options = data.pop('connect_options', {})
preference = Preference.objects.filter( default_name_opts = {
name=name, user=user, category='koko' 'file_name_conflict_resolution': FileNameConflictResolution.REPLACE,
).first() 'terminal_theme_name': 'Default',
value = preference.value if preference else FileNameConflictResolution.REPLACE }
preferences_query = Preference.objects.filter(
user=user, category='koko', name__in=default_name_opts.keys()
).values_list('name', 'value')
preferences = dict(preferences_query)
for name in default_name_opts.keys():
value = preferences.get(name, default_name_opts[name])
connect_options[name] = value connect_options[name] = value
data['connect_options'] = connect_options data['connect_options'] = connect_options

2
apps/users/serializers/preference/koko.py
View File

@ -9,6 +9,8 @@ class BasicSerializer(serializers.Serializer):
FileNameConflictResolution.choices, default=FileNameConflictResolution.REPLACE, FileNameConflictResolution.choices, default=FileNameConflictResolution.REPLACE,
required=False, label=_('File name conflict resolution') required=False, label=_('File name conflict resolution')
) )
terminal_theme_name = serializers.CharField(
max_length=128, required=False, default='Default', label=_('Terminal theme name'))
class KokoSerializer(serializers.Serializer): class KokoSerializer(serializers.Serializer):