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

fix: 资产登录未发送提醒

pull/12660/head
wangruidong 2024-02-06 11:33:04 +08:00 committed by Bryan
parent eaca296bd0
commit 2062778ab8
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/acls/notifications.py
View File

@ -41,21 +41,21 @@ class UserLoginReminderMsg(UserMessage):
class AssetLoginReminderMsg(UserMessage): class AssetLoginReminderMsg(UserMessage):
subject = _('Asset login reminder') subject = _('Asset login reminder')
def __init__(self, user, asset: Asset, login_user: User, account_username): def __init__(self, user, asset: Asset, login_user: User, account: Account, input_username):
self.asset = asset self.asset = asset
self.login_user = login_user self.login_user = login_user
self.account_username = account_username self.account = account
self.input_username = input_username
super().__init__(user) super().__init__(user)
def get_html_msg(self) -> dict: def get_html_msg(self) -> dict:
account = Account.objects.get(asset=self.asset, username=self.account_username)
context = { context = {
'recipient': self.user, 'recipient': self.user,
'username': self.login_user.username, 'username': self.login_user.username,
'name': self.login_user.name, 'name': self.login_user.name,
'asset': str(self.asset), 'asset': str(self.asset),
'account': self.account_username, 'account': self.input_username,
'account_name': account.name, 'account_name': self.account.name,
} }
message = render_to_string('acls/asset_login_reminder.html', context) message = render_to_string('acls/asset_login_reminder.html', context)

2
apps/authentication/api/connection_token.py
View File

@ -443,7 +443,7 @@ class ConnectionTokenViewSet(ExtraActionApiMixin, RootOrgViewMixin, JMSModelView
self._record_operate_log(acl, asset) self._record_operate_log(acl, asset)
for reviewer in reviewers: for reviewer in reviewers:
AssetLoginReminderMsg( AssetLoginReminderMsg(
reviewer, asset, user, self.input_username reviewer, asset, user, account, self.input_username
).publish_async() ).publish_async()
def create(self, request, *args, **kwargs): def create(self, request, *args, **kwargs):

1
apps/perms/utils/user_perm_tree.py
View File

@ -194,6 +194,7 @@ class UserPermTreeExpireUtil(_UserPermTreeCacheMixin):
@on_transaction_commit @on_transaction_commit
def expire_perm_tree_for_users_orgs(self, user_ids, org_ids): def expire_perm_tree_for_users_orgs(self, user_ids, org_ids):
user_ids = list(user_ids)
org_ids = [str(oid) for oid in org_ids] org_ids = [str(oid) for oid in org_ids]
with self.client.pipeline() as p: with self.client.pipeline() as p:
for uid in user_ids: for uid in user_ids: