From 10267863bb9f02eed40180cbad8cf30a9aa82588 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 6 Feb 2025 10:04:54 +0800 Subject: [PATCH] perf: update intergration --- .pylintrc | 3 +-- apps/accounts/demos/python/jms_pam/main.py | 9 ++++++--- apps/accounts/models/application.py | 9 ++++++--- apps/i18n/lina/en.json | 2 ++ apps/i18n/lina/zh.json | 2 ++ apps/users/api/group.py | 2 +- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/.pylintrc b/.pylintrc index 6d99228cd..e03daa5a4 100644 --- a/.pylintrc +++ b/.pylintrc @@ -1,3 +1,2 @@ [MESSAGES CONTROL] -disable=C0115 -disable=C0116 +disable=missing-module-docstring,missing-class-docstring,missing-function-docstring,too-many-ancestors diff --git a/apps/accounts/demos/python/jms_pam/main.py b/apps/accounts/demos/python/jms_pam/main.py index 7cacd1fc2..e77a74755 100644 --- a/apps/accounts/demos/python/jms_pam/main.py +++ b/apps/accounts/demos/python/jms_pam/main.py @@ -1,12 +1,11 @@ -import requests import uuid - from datetime import datetime from urllib.parse import urlencode + +import requests from httpsig.requests_auth import HTTPSignatureAuth from requests.exceptions import RequestException - DEFAULT_ORG_ID = '00000000-0000-0000-0000-000000000002' @@ -36,6 +35,7 @@ class SecretRequest(object): Raises: ValueError: If the parameters do not meet the requirements, a detailed error message will be raised. """ + def __init__(self, asset='', asset_id='', account='', account_id=''): self.account_id = account_id self.asset_id = asset_id @@ -143,3 +143,6 @@ class JumpServerPAM(object): except RequestException as e: return Secret.from_exception(e) return Secret.from_response(response) + + def get_accounts(self): + pass diff --git a/apps/accounts/models/application.py b/apps/accounts/models/application.py index 1f5097489..b214e0319 100644 --- a/apps/accounts/models/application.py +++ b/apps/accounts/models/application.py @@ -27,11 +27,14 @@ class IntegrationApplication(JMSOrgBaseModel): unique_together = [('name', 'org_id')] verbose_name = _('Integration App') - @property - def accounts_amount(self): + def get_accounts(self): qs = Account.objects.all() query = RelatedManager.get_to_filter_qs(self.accounts.value, Account) - return qs.filter(*query).count() + return qs.filter(*query) + + @property + def accounts_amount(self): + return self.get_accounts().count() @property def is_valid(self): diff --git a/apps/i18n/lina/en.json b/apps/i18n/lina/en.json index 4cd6cfc3f..106ffafec 100644 --- a/apps/i18n/lina/en.json +++ b/apps/i18n/lina/en.json @@ -1014,6 +1014,8 @@ "RoleInfo": "Role information", "RoleList": "Roles", "RoleUpdate": "Update the role", + "UpgradeEnterpriseEditionHelpText": "Upgrade to enterprise edition to enjoy this feature", + "UpgradeEnterpriseEdition": "Upgrade to Enterprise Edition", "RoleUsers": "Authorized users", "Rows": "Row", "Rule": "Condition", diff --git a/apps/i18n/lina/zh.json b/apps/i18n/lina/zh.json index a0dd0f33c..caf55e2bb 100644 --- a/apps/i18n/lina/zh.json +++ b/apps/i18n/lina/zh.json @@ -992,6 +992,8 @@ "ResetSSHKey": "重置SSH密钥", "ResetSSHKeySuccessMsg": "发送邮件任务已提交, 用户稍后会收到重置密钥邮件", "ResetSSHKeyWarningMsg": "你确定要发送重置用户的SSH Key的邮件吗?", + "UpgradeEnterpriseEditionHelpText": "升级到企业版,解锁当前功能", + "UpgradeEnterpriseEdition": "升级企业版", "Resource": "资源", "ResourceType": "资源类型", "ResolveSelected": "解决所选", diff --git a/apps/users/api/group.py b/apps/users/api/group.py index 90cfba315..8e9832984 100644 --- a/apps/users/api/group.py +++ b/apps/users/api/group.py @@ -25,7 +25,7 @@ class UserGroupViewSet(OrgBulkModelViewSet): ) @action(methods=['post'], detail=True, url_path='add-all-users') - def add_all_users(self, request, *args, **kwargs): + def add_all_users(self, _): instance = self.get_object() users = User.get_org_users().exclude(groups__id=instance.id) instance.users.add(*users)