External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-12 11:57:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

[4.6] Fix additional UI URL generated by API (#15517) (#15518) (#6695)

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

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

---------

Co-authored-by: Peter Braun <pbraun@redhat.com>
This commit is contained in:
Hao Liu
2024-09-13 21:12:08 -04:00
committed by GitHub
parent f799376b3d
commit aef3d8750b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/management/commands/disable_instance.py
View File

@@ -63,7 +63,7 @@ class AWXInstance:
def instance_pretty(self): def instance_pretty(self):
instance = ( instance = (
self.instance.hostname, 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]})" return f"[\"{instance[0]}\"]({instance[1]})"

2
awx/main/models/jobs.py
View File

@@ -1275,7 +1275,7 @@ class SystemJob(UnifiedJob, SystemJobOptions, JobNotificationMixin):
return reverse('api:system_job_detail', kwargs={'pk': self.pk}, request=request) return reverse('api:system_job_detail', kwargs={'pk': self.pk}, request=request)
def get_ui_url(self): 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 @property
def event_class(self): def event_class(self):