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

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

pull/9246/head
ibuler 2022-12-26 18:58:48 +08:00
parent 3145582f0b d2ba7a98ea
commit dd630f0e14
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -16,6 +16,7 @@ dump.rdb
.cache/ .cache/
.idea/ .idea/
.vscode/ .vscode/
.fleet/
db.sqlite3 db.sqlite3
config.py config.py
config.yml config.yml

8
apps/perms/serializers/permission.py
View File

@ -20,12 +20,12 @@ class ActionChoicesField(BitChoicesField):
class AssetPermissionSerializer(BulkOrgResourceModelSerializer): class AssetPermissionSerializer(BulkOrgResourceModelSerializer):
users = ObjectRelatedField(queryset=User.objects, many=True, required=False) users = ObjectRelatedField(queryset=User.objects, many=True, required=False, label=_('User'))
user_groups = ObjectRelatedField( user_groups = ObjectRelatedField(
queryset=UserGroup.objects, many=True, required=False queryset=UserGroup.objects, many=True, required=False, label=_('User group')
) )
assets = ObjectRelatedField(queryset=Asset.objects, many=True, required=False) assets = ObjectRelatedField(queryset=Asset.objects, many=True, required=False, label=_('Asset'))
nodes = ObjectRelatedField(queryset=Node.objects, many=True, required=False) nodes = ObjectRelatedField(queryset=Node.objects, many=True, required=False, label=_('Node'))
actions = ActionChoicesField(required=False, allow_null=True, label=_("Actions")) actions = ActionChoicesField(required=False, allow_null=True, label=_("Actions"))
is_valid = serializers.BooleanField(read_only=True, label=_("Is valid")) is_valid = serializers.BooleanField(read_only=True, label=_("Is valid"))
is_expired = serializers.BooleanField(read_only=True, label=_("Is expired")) is_expired = serializers.BooleanField(read_only=True, label=_("Is expired"))