github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-20 11:00:35 +00:00
Code Issues Projects Releases Wiki Activity

perf: 工单直接审批者访问链接无认证跳转到登录页面 (#11902)

Browse Source 
* perf: 工单直接审批者访问链接无认证跳转到登录页面

* perf: 修改重定向登录地址

* perf: 跳转字段标识更新
This commit is contained in:
jiangweidong
2023-10-19 11:21:08 +08:00
committed by GitHub
parent ca0dca26c7
commit 03d1a187df
2 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
apps/tickets/views/approve.py
View File

@@ -64,30 +64,28 @@ class TicketDirectApproveView(TemplateView):
def get_context_data(self, **kwargs):
# 放入工单信息
token = kwargs.get('token')
content = cache.get(token, {}).get('content', [])
if self.request.user.is_authenticated:
prompt_msg = _('Click the button below to approve or reject')
else:
prompt_msg = _('After successful authentication, this ticket can be approved directly')
kwargs.update({
'content': content, 'prompt_msg': prompt_msg,
'login_url': '%s&next=%s' % (
self.login_url,
reverse('tickets:direct-approve', kwargs={'token': token})
),
'content': kwargs['ticket_info'].get('content', []),
'prompt_msg': _('Click the button below to approve or reject'),
})
return super().get_context_data(**kwargs)
def get(self, request, *args, **kwargs):
if not request.user.is_authenticated:
return HttpResponse(status=401)
direct_url = reverse('tickets:direct-approve', kwargs={'token': kwargs['token']})
message_data = {
'title': _('Ticket approval'),
'message': _('After successful authentication, this ticket can be approved directly'),
'redirect_url': f'{self.login_url}&{self.redirect_field_name}={direct_url}',
'auto_redirect': True,
}
redirect_url = FlashMessageUtil.gen_message_url(message_data)
return redirect(redirect_url)
token = kwargs.get('token')
ticket_info = cache.get(token)
ticket_info = cache.get(kwargs['token'])
if not ticket_info:
return self.redirect_message_response(redirect_url=self.login_url)
return super().get(request, *args, **kwargs)
return super().get(request, ticket_info=ticket_info, *args, **kwargs)
def post(self, request, **kwargs):
user = request.user