From e7dd731139334e4f18dd10f2298d3f9b3c21dc76 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Wed, 20 Jul 2022 15:44:00 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8E=88=E6=9D=83=E8=BF=87=E6=9C=9Furl?= =?UTF-8?q?=20404=20->=20/console/=20(#8634)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: feng626 <1304903146@qq.com> --- apps/perms/notifications.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/perms/notifications.py b/apps/perms/notifications.py index a6316eb8a..088fa107a 100644 --- a/apps/perms/notifications.py +++ b/apps/perms/notifications.py @@ -1,6 +1,3 @@ -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 @@ -52,7 +49,7 @@ class AssetPermsWillExpireForOrgAdminMsg(UserMessage): url = js_reverse( 'perms:asset-permission-detail', kwargs={'pk': perm.id}, external=True, - api_to_ui=True + api_to_ui=True, is_console=True ) + f'?oid={perm.org_id}' items_with_url.append([perm.name, url]) return items_with_url @@ -123,9 +120,12 @@ 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 = perm_detail_url.format(perm.id) + f'?oid={perm.org_id}' + url = js_reverse( + 'perms:application-permission-detail', + kwargs={'pk': perm.id}, external=True, + api_to_ui=True, is_console=True + ) + f'?oid={perm.org_id}' items_with_url.append([perm.name, url]) return items_with_url