github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-06-23 21:47:27 +00:00
Code Issues Projects Releases Wiki Activity

revert: asset permission real accounts serializer

Browse Source
This commit is contained in:
ibuler 2024-06-06 16:56:07 +08:00
parent 1b05f56598
commit 7973d066a3
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/i18n/lina/en.json
View File

@ -79,7 +79,7 @@
"Aliyun": "Alibaba cloud", "Aliyun": "Alibaba cloud",
"All": "All", "All": "All",
"AllAccountTip": "All accounts already added on the asset", "AllAccountTip": "All accounts already added on the asset",
"AllAccounts": "Existing accounts", "AllAccounts": "All existing accounts",
"AllClickRead": "Mark all as read", "AllClickRead": "Mark all as read",
"AllMembers": "All members", "AllMembers": "All members",
"AllowInvalidCert": "Ignore certificate check", "AllowInvalidCert": "Ignore certificate check",

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

@ -43,8 +43,6 @@ class AssetPermissionSerializer(ResourceLabelsMixin, BulkOrgResourceModelSeriali
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"))
accounts = serializers.ListField(label=_("Accounts"), required=False) accounts = serializers.ListField(label=_("Accounts"), required=False)
real_accounts = serializers.ListField(label=_("General accounts"), required=False)
virtual_accounts = serializers.ListField(label=_("Virtual accounts"), required=False)
protocols = serializers.ListField(label=_("Protocols"), required=False) protocols = serializers.ListField(label=_("Protocols"), required=False)
template_accounts = AccountTemplate.objects.none() template_accounts = AccountTemplate.objects.none()
@ -54,7 +52,7 @@ class AssetPermissionSerializer(ResourceLabelsMixin, BulkOrgResourceModelSeriali
fields_mini = ["id", "name"] fields_mini = ["id", "name"]
amount_fields = ["users_amount", "user_groups_amount", "assets_amount", "nodes_amount"] amount_fields = ["users_amount", "user_groups_amount", "assets_amount", "nodes_amount"]
fields_generic = [ fields_generic = [
"accounts", "real_accounts", "virtual_accounts", "protocols", "actions", "accounts", "protocols", "actions",
"created_by", "date_created", "date_start", "date_expired", "is_active", "created_by", "date_created", "date_start", "date_expired", "is_active",
"is_expired", "is_valid", "comment", "from_ticket", "is_expired", "is_valid", "comment", "from_ticket",
] ]
@ -137,9 +135,6 @@ class AssetPermissionSerializer(ResourceLabelsMixin, BulkOrgResourceModelSeriali
template_usernames = list(self.template_accounts.values_list('username', flat=True)) template_usernames = list(self.template_accounts.values_list('username', flat=True))
return list(set(account_usernames + template_usernames)) return list(set(account_usernames + template_usernames))
def validate_real_accounts(self, usernames):
return self.validate_accounts(usernames)
@classmethod @classmethod
def setup_eager_loading(cls, queryset): def setup_eager_loading(cls, queryset):
"""Perform necessary eager loading of data.""" """Perform necessary eager loading of data."""