pref: 修改使用的消息内容 (#7061)

* perf:  再次优化通知

* pref: 修改使用的消息内容

* perf: 修复url地址

Co-authored-by: ibuler <ibuler@qq.com>
This commit is contained in:
fit2bot
2021-10-22 20:06:16 +08:00
committed by GitHub
parent a0db2f6ef8
commit c244cf5f43
29 changed files with 570 additions and 420 deletions

View File

@@ -1,4 +1,6 @@
from urllib.parse import urljoin
from django.conf import settings
from django.utils.translation import ugettext as _
from django.template.loader import render_to_string
@@ -6,7 +8,7 @@ from common.utils import reverse as js_reverse
from notifications.notifications import UserMessage
class PermedWillExpireUserMsg(UserMessage):
class PermedAssetsWillExpireUserMsg(UserMessage):
def __init__(self, user, assets):
super().__init__(user)
self.assets = assets
@@ -114,12 +116,9 @@ class AppPermsWillExpireForOrgAdminMsg(UserMessage):
def get_items_with_url(self):
items_with_url = []
perm_detail_url = urljoin(settings.SITE_URL, '/ui/#/perms/app-permissions/{}')
for perm in self.perms:
url = js_reverse(
'perms:application-permission-detail',
kwargs={'pk': perm.id}, external=True,
api_to_ui=True
) + f'?oid={perm.org_id}'
url = perm_detail_url.format(perm.id) + f'?oid={perm.org_id}'
items_with_url.append([perm.name, url])
return items_with_url