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

perf: some word translate

pull/13500/head
ibuler 2024-06-25 14:21:29 +08:00 committed by 老广
parent 66615b7dd3
commit 85700a2a26
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/const/automation.py
View File

@ -4,7 +4,7 @@ from django.utils.translation import gettext_lazy as _
class Connectivity(TextChoices): class Connectivity(TextChoices):
UNKNOWN = '-', _('Unknown') UNKNOWN = '-', _('Unknown')
OK = 'ok', _('Ok') OK = 'ok', _('OK')
ERR = 'err', _('Error') ERR = 'err', _('Error')

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

@ -292,7 +292,7 @@
"Confirm": "Confirm", "Confirm": "Confirm",
"ConfirmPassword": "Confirm password", "ConfirmPassword": "Confirm password",
"Connect": "Connect", "Connect": "Connect",
"ConnectAssets": "Connect assets", "ConnectAssets": "Access assets",
"ConnectMethod": "Connect method", "ConnectMethod": "Connect method",
"ConnectMethodACLHelpMsg": "Connect methods can be filtered to control whether users can use a certain connect method to login to the asset. according to your set rules, some connect methods can be allowed, while others can be prohibited (globally effective).", "ConnectMethodACLHelpMsg": "Connect methods can be filtered to control whether users can use a certain connect method to login to the asset. according to your set rules, some connect methods can be allowed, while others can be prohibited (globally effective).",
"ConnectMethodACLHelpText": "Connect methods can be filtered to control whether users can use a certain connect method to login to the asset. according to your set rules, some connect methods can be allowed, while others can be prohibited.", "ConnectMethodACLHelpText": "Connect methods can be filtered to control whether users can use a certain connect method to login to the asset. according to your set rules, some connect methods can be allowed, while others can be prohibited.",

2
apps/users/models/user.py
View File

@ -776,7 +776,7 @@ class JSONFilterMixin:
if match == "m2m_all": if match == "m2m_all":
user_id = ( user_id = (
bindings.values("user_id") bindings.values("user_id")
.annotate(count=Count("user_id", distinct=True)) .annotate(count=Count("user_id")) # 这里不能有 distinct 会导致 count 不准确, acls 中过滤用户时会出现问题
.filter(count=len(value)) .filter(count=len(value))
.values_list("user_id", flat=True) .values_list("user_id", flat=True)
) )