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

fix: 授权过期url 404 -> /console/ (#8634) 

Co-authored-by: feng626 <1304903146@qq.com>
pull/8638/head
fit2bot 2022-07-20 15:44:00 +08:00 committed by GitHub
parent 88ae8ac67a
commit e7dd731139
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/perms/notifications.py
View File

@ -1,6 +1,3 @@
from urllib.parse import urljoin
from django.conf import settings
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from django.template.loader import render_to_string from django.template.loader import render_to_string
@ -52,7 +49,7 @@ class AssetPermsWillExpireForOrgAdminMsg(UserMessage):
url = js_reverse( url = js_reverse(
'perms:asset-permission-detail', 'perms:asset-permission-detail',
kwargs={'pk': perm.id}, external=True, kwargs={'pk': perm.id}, external=True,
api_to_ui=True api_to_ui=True, is_console=True
) + f'?oid={perm.org_id}' ) + f'?oid={perm.org_id}'
items_with_url.append([perm.name, url]) items_with_url.append([perm.name, url])
return items_with_url return items_with_url
@ -123,9 +120,12 @@ class AppPermsWillExpireForOrgAdminMsg(UserMessage):
def get_items_with_url(self): def get_items_with_url(self):
items_with_url = [] items_with_url = []
perm_detail_url = urljoin(settings.SITE_URL, '/ui/#/perms/app-permissions/{}')
for perm in self.perms: 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]) items_with_url.append([perm.name, url])
return items_with_url return items_with_url