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

fix: fix conflicts

pull/10196/head
Bai 2023-04-13 19:19:20 +08:00 committed by Jiangjie.Bai
parent 928513edd0
commit 21da805e78
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/accounts/serializers/account/account.py
View File

@ -385,10 +385,7 @@ class AccountHistorySerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = Account.history.model model = Account.history.model
fields = [ fields = ['id', 'secret', 'secret_type', 'version', 'history_date', 'history_user']
'id', 'secret', 'secret_type', 'version',
'history_date', 'history_user'
]
read_only_fields = fields read_only_fields = fields
extra_kwargs = { extra_kwargs = {
'history_user': {'label': _('User')}, 'history_user': {'label': _('User')},