Merge pull request TencentBlueKing#1170 from hanshuaikang/feature/dev…

…elop_by_han minor: 通知加上步骤ID
luofann · Aug 17, 2023 · ea3aa59 · ea3aa59
2 parents babd4cc + 3368bdb
commit ea3aa59
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/itsm/ticket/models/ticket.py b/itsm/ticket/models/ticket.py
@@ -1513,7 +1513,8 @@ def priority_name(self):
     def ticket_url(self):
         if not self.notify_url:
             return "{site_url}/#/ticket/{ticket_id}/".format(
-                site_url=settings.TICKET_NOTIFY_HOST.rstrip("/"), ticket_id=self.id
+                site_url=settings.TICKET_NOTIFY_HOST.rstrip("/"),
+                ticket_id=self.id,
             )
         return self.notify_url
 
@@ -1552,11 +1553,12 @@ def generate_ticket_url(self, state_id, receivers):
             }
         )
         client = Cache()
-        self.notify_url = "{site_url}/#/ticket/{ticket_id}/?token={token}&cache_key={cache_key}".format(
+        self.notify_url = "{site_url}/#/ticket/{ticket_id}/?token={token}&cache_key={cache_key}&step_id={step_id}".format(  # noqa
             site_url=settings.TICKET_NOTIFY_HOST.rstrip("/"),
             ticket_id=self.id,
             token=ticket_token,
             cache_key=cache_key,
+            step_id=status.id,
         )
         data = json.dumps({"state_id": state_id, "ticket_id": self.id})
         client.set(cache_key, data, 60 * 60 * 24 * 30)