From aef3d8750b611cb2f1d804221736d42a196a66c3 Mon Sep 17 00:00:00 2001
From: Hao Liu <44379968+TheRealHaoLiu@users.noreply.github.com>
Date: Fri, 13 Sep 2024 21:12:08 -0400
Subject: [PATCH] [4.6] Fix additional UI URL generated by API (#15517)
 (#15518)  (#6695)

* Fix: change to url in platform ui (#15518)

* Fix instance UI URL generated by API (#15517)

---------

Co-authored-by: Peter Braun <pbraun@redhat.com>
---
 awx/main/management/commands/disable_instance.py | 2 +-
 awx/main/models/jobs.py                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/awx/main/management/commands/disable_instance.py b/awx/main/management/commands/disable_instance.py
index 054e47974b..1c57d229b5 100644
--- a/awx/main/management/commands/disable_instance.py
+++ b/awx/main/management/commands/disable_instance.py
@@ -63,7 +63,7 @@ class AWXInstance:
     def instance_pretty(self):
         instance = (
             self.instance.hostname,
-            urljoin(settings.TOWER_URL_BASE, f"/#/instances/{self.instance.pk}/details"),
+            urljoin(settings.TOWER_URL_BASE, f"{settings.OPTIONAL_UI_URL_PREFIX}/infrastructure/instances/{self.instance.pk}/details"),
         )
         return f"[\"{instance[0]}\"]({instance[1]})"
 
diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py
index a1982d1ac0..307e49aaa6 100644
--- a/awx/main/models/jobs.py
+++ b/awx/main/models/jobs.py
@@ -1275,7 +1275,7 @@ class SystemJob(UnifiedJob, SystemJobOptions, JobNotificationMixin):
         return reverse('api:system_job_detail', kwargs={'pk': self.pk}, request=request)
 
     def get_ui_url(self):
-        return urljoin(settings.TOWER_URL_BASE, "{}/jobs/system/{}".format(settings.OPTIONAL_UI_URL_PREFIX, self.pk))
+        return urljoin(settings.TOWER_URL_BASE, "{}/jobs/management/{}".format(settings.OPTIONAL_UI_URL_PREFIX, self.pk))
 
     @property
     def event_class(self):