diff --git a/awx/ui/client/features/jobs/jobsList.controller.js b/awx/ui/client/features/jobs/jobsList.controller.js index 93d178adde..d09101037e 100644 --- a/awx/ui/client/features/jobs/jobsList.controller.js +++ b/awx/ui/client/features/jobs/jobsList.controller.js @@ -159,7 +159,7 @@ function ListJobsController ( }; vm.getWebhookDetails = (job) => { - if (!job.webhook_guid) { + if (job.launch_type !== 'webhook') { return null; } diff --git a/awx/ui/client/features/output/details.component.js b/awx/ui/client/features/output/details.component.js index a20713bd73..71607a5a83 100644 --- a/awx/ui/client/features/output/details.component.js +++ b/awx/ui/client/features/output/details.component.js @@ -254,9 +254,9 @@ function getLaunchedByDetails () { const workflowJobTemplate = resource.model.get('summary_fields.workflow_job_template'); const relatedSchedule = resource.model.get('related.schedule'); const schedule = resource.model.get('summary_fields.schedule'); - const webhookGUID = resource.model.get('webhook_guid'); + const launchType = resource.model.get('launch_type'); - if (!createdBy && !schedule && !webhookGUID) { + if (!createdBy && !schedule && !launchType) { return null; } @@ -266,11 +266,11 @@ function getLaunchedByDetails () { let tooltip; let value; - if (webhookGUID && jobTemplate) { + if (launchType === 'webhook' && jobTemplate) { tooltip = strings.get('tooltips.WEBHOOK_JOB_TEMPLATE'); link = `/#/templates/job_template/${jobTemplate.id}`; value = strings.get('details.WEBHOOK'); - } else if (webhookGUID && workflowJobTemplate) { + } else if (launchType === 'webhook' && workflowJobTemplate) { tooltip = strings.get('tooltips.WEBHOOK_WORKFLOW_JOB_TEMPLATE'); link = `/#/templates/workflow_job_template/${workflowJobTemplate.id}`; value = strings.get('details.WEBHOOK'); diff --git a/awx/ui/client/src/workflow-results/workflow-results.controller.js b/awx/ui/client/src/workflow-results/workflow-results.controller.js index 151b075f5f..d18f90f02f 100644 --- a/awx/ui/client/src/workflow-results/workflow-results.controller.js +++ b/awx/ui/client/src/workflow-results/workflow-results.controller.js @@ -38,7 +38,7 @@ export default ['workflowData', 'workflowResultsService', 'workflowDataOptions', $scope.network_credential_link = getLink('network_credential'); $scope.launched_by_webhook_link = null; - if ($scope.workflow.webhook_guid) { + if ($scope.workflow.launch_type === 'webhook') { $scope.launched_by_webhook_link = $scope.workflow_template_link; }