From 95a4be6bc83511fe189ff030d8155c5eb8836fa6 Mon Sep 17 00:00:00 2001
From: fit2bot <68588906+fit2bot@users.noreply.github.com>
Date: Fri, 15 May 2026 18:16:51 +0800
Subject: [PATCH] fix: Error in direct approval of work order through link jump
 (#16841)

Co-authored-by: wangruidong <940853815@qq.com>
---
 .../templates/tickets/approve_check_password.html    |  1 -
 apps/tickets/views/approve.py                        | 12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/apps/tickets/templates/tickets/approve_check_password.html b/apps/tickets/templates/tickets/approve_check_password.html
index dabaaf7d8..fac814961 100644
--- a/apps/tickets/templates/tickets/approve_check_password.html
+++ b/apps/tickets/templates/tickets/approve_check_password.html
@@ -111,7 +111,6 @@
 
                 .field-value {
                     color: #1F2329;
-                    display: inline-block;
                 }
             }
         }
diff --git a/apps/tickets/views/approve.py b/apps/tickets/views/approve.py
index 553fcfe69..92409e2eb 100644
--- a/apps/tickets/views/approve.py
+++ b/apps/tickets/views/approve.py
@@ -3,16 +3,14 @@
 
 from __future__ import unicode_literals
 
-from django.core.cache import cache
-from django.http import HttpResponse
 from django.conf import settings
+from django.core.cache import cache
 from django.shortcuts import redirect, reverse
 from django.utils.translation import gettext as _
 from django.views.generic.base import TemplateView
 
-from common.utils import get_logger, FlashMessageUtil
 from common.exceptions import JMSException
-from users.models import User
+from common.utils import get_logger, FlashMessageUtil
 from orgs.utils import tmp_to_root_org
 from tickets.const import TicketType
 from tickets.errors import AlreadyClosed
@@ -20,6 +18,7 @@ from tickets.models import (
     Ticket, ApplyAssetTicket,
     ApplyLoginTicket, ApplyLoginAssetTicket, ApplyCommandTicket
 )
+from users.models import User
 
 logger = get_logger(__name__)
 
@@ -49,7 +48,7 @@ class TicketDirectApproveView(TemplateView):
 
     @property
     def login_url(self):
-        return reverse('authentication:login') + '?admin=1'
+        return reverse('authentication:login') + f'?admin=1&{self.redirect_field_name}=/'
 
     def redirect_message_response(self, **kwargs):
         message_data = self.message_data
@@ -76,10 +75,11 @@ class TicketDirectApproveView(TemplateView):
     def get(self, request, *args, **kwargs):
         if not (settings.TICKETS_DIRECT_APPROVE or request.user.is_authenticated):
             direct_url = reverse('tickets:direct-approve', kwargs={'token': kwargs['token']})
+            redirect_url = f'{reverse('authentication:login') + '?admin=1'}&{self.redirect_field_name}={direct_url}'
             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}',
+                'redirect_url': redirect_url,
                 'auto_redirect': True,
             }
             redirect_url = FlashMessageUtil.gen_message_url(message_data)