diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index 429a99b44..bee46e7bb 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -79,7 +79,7 @@ "Aliyun": "Alibaba cloud", "All": "All", "AllAccountTip": "All accounts already added on the asset", - "AllAccounts": "Existing accounts", + "AllAccounts": "All existing accounts", "AllClickRead": "Mark all as read", "AllMembers": "All members", "AllowInvalidCert": "Ignore certificate check", diff --git a/apps/perms/serializers/permission.py b/apps/perms/serializers/permission.py index 088cb0c68..e4bf33364 100644 --- a/apps/perms/serializers/permission.py +++ b/apps/perms/serializers/permission.py @@ -43,8 +43,6 @@ class AssetPermissionSerializer(ResourceLabelsMixin, BulkOrgResourceModelSeriali is_valid = serializers.BooleanField(read_only=True, label=_("Is valid")) is_expired = serializers.BooleanField(read_only=True, label=_("Is expired")) 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) template_accounts = AccountTemplate.objects.none() @@ -54,7 +52,7 @@ class AssetPermissionSerializer(ResourceLabelsMixin, BulkOrgResourceModelSeriali fields_mini = ["id", "name"] amount_fields = ["users_amount", "user_groups_amount", "assets_amount", "nodes_amount"] fields_generic = [ - "accounts", "real_accounts", "virtual_accounts", "protocols", "actions", + "accounts", "protocols", "actions", "created_by", "date_created", "date_start", "date_expired", "is_active", "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)) return list(set(account_usernames + template_usernames)) - def validate_real_accounts(self, usernames): - return self.validate_accounts(usernames) - @classmethod def setup_eager_loading(cls, queryset): """Perform necessary eager loading of data."""