From 45ffe7a955c5fc854104837a9fb80c05b0827443 Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Wed, 2 May 2018 13:50:59 -0400 Subject: [PATCH] update api-ui job urls --- awx/main/models/ad_hoc_commands.py | 2 +- awx/main/models/inventory.py | 2 +- awx/main/models/jobs.py | 4 ++-- awx/main/models/projects.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/awx/main/models/ad_hoc_commands.py b/awx/main/models/ad_hoc_commands.py index 3913a4ace7..3549bb2a41 100644 --- a/awx/main/models/ad_hoc_commands.py +++ b/awx/main/models/ad_hoc_commands.py @@ -153,7 +153,7 @@ class AdHocCommand(UnifiedJob, JobNotificationMixin): return reverse('api:ad_hoc_command_detail', kwargs={'pk': self.pk}, request=request) def get_ui_url(self): - return urljoin(settings.TOWER_URL_BASE, "/#/ad_hoc_commands/{}".format(self.pk)) + return urljoin(settings.TOWER_URL_BASE, "/#/jobs/command/{}".format(self.pk)) @property def notification_templates(self): diff --git a/awx/main/models/inventory.py b/awx/main/models/inventory.py index c748f841f3..24d0e9a1c5 100644 --- a/awx/main/models/inventory.py +++ b/awx/main/models/inventory.py @@ -1646,7 +1646,7 @@ class InventoryUpdate(UnifiedJob, InventorySourceOptions, JobNotificationMixin, return reverse('api:inventory_update_detail', kwargs={'pk': self.pk}, request=request) def get_ui_url(self): - return urljoin(settings.TOWER_URL_BASE, "/#/inventory_sync/{}".format(self.pk)) + return urljoin(settings.TOWER_URL_BASE, "/#/jobs/inventory/{}".format(self.pk)) def get_actual_source_path(self): '''Alias to source_path that combines with project path for for SCM file based sources''' diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py index 51394aa830..80280636cc 100644 --- a/awx/main/models/jobs.py +++ b/awx/main/models/jobs.py @@ -530,7 +530,7 @@ class Job(UnifiedJob, JobOptions, SurveyJobMixin, JobNotificationMixin, TaskMana return reverse('api:job_detail', kwargs={'pk': self.pk}, request=request) def get_ui_url(self): - return urljoin(settings.TOWER_URL_BASE, "/#/jobs/{}".format(self.pk)) + return urljoin(settings.TOWER_URL_BASE, "/#/jobs/playbook/{}".format(self.pk)) @property def ansible_virtualenv_path(self): @@ -1192,7 +1192,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, "/#/management_jobs/{}".format(self.pk)) + return urljoin(settings.TOWER_URL_BASE, "/#/jobs/system/{}".format(self.pk)) @property def event_class(self): diff --git a/awx/main/models/projects.py b/awx/main/models/projects.py index d302aa0973..d99fe5bafb 100644 --- a/awx/main/models/projects.py +++ b/awx/main/models/projects.py @@ -533,7 +533,7 @@ class ProjectUpdate(UnifiedJob, ProjectOptions, JobNotificationMixin, TaskManage return reverse('api:project_update_detail', kwargs={'pk': self.pk}, request=request) def get_ui_url(self): - return urlparse.urljoin(settings.TOWER_URL_BASE, "/#/scm_update/{}".format(self.pk)) + return urlparse.urljoin(settings.TOWER_URL_BASE, "/#/jobs/project/{}".format(self.pk)) def _update_parent_instance(self): parent_instance = self._get_parent_instance()