github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-10-22 00:09:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'lina' of github.com:jumpserver/jumpserver into lina

Browse Source
This commit is contained in:
ibuler
2020-05-26 19:00:00 +08:00
parent 3c95c6fe11 71a72dd957
commit f528dd4888
3 changed files with 109 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/perms/serializers/asset_permission.py
View File

@@ -43,7 +43,8 @@ class AssetPermissionSerializer(BulkOrgResourceModelSerializer):
model = AssetPermission
mini_fields = ['id', 'name']
small_fields = mini_fields + [
'is_active', 'is_expired', 'is_valid', 'actions', 'created_by', 'date_created'
'is_active', 'is_expired', 'is_valid', 'actions', 'created_by', 'date_created',
'date_expired', 'date_start', 'comment'
]
m2m_fields = [
'users', 'user_groups', 'assets', 'nodes', 'system_users',