External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-12 18:40:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

always show launched by webhook details if there's a webhook guid

Browse Source
This commit is contained in:
Jake McDermott 2019-09-10 10:39:01 -04:00 committed by Jeff Bradberry
parent 6b17e86f30
commit 5e9448a854
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
awx/ui/client/features/output/details.component.js
View File

@ -266,15 +266,7 @@ function getLaunchedByDetails () {
let tooltip;
let value;
if (createdBy) {
tooltip = strings.get('tooltips.USER');
link = `/#/users/${createdBy.id}`;
value = $filter('sanitize')(createdBy.username);
} else if (relatedSchedule && jobTemplate) {
tooltip = strings.get('tooltips.SCHEDULE');
link = `/#/templates/job_template/${jobTemplate.id}/schedules/${schedule.id}`;
value = $filter('sanitize')(schedule.name);
} else if (webhookGUID && jobTemplate) {
if (webhookGUID && jobTemplate) {
tooltip = strings.get('tooltips.WEBHOOK_JOB_TEMPLATE');
link = `/#/templates/job_template/${jobTemplate.id}`;
value = strings.get('details.WEBHOOK');
@ -282,6 +274,14 @@ function getLaunchedByDetails () {
tooltip = strings.get('tooltips.WEBHOOK_WORKFLOW_JOB_TEMPLATE');
link = `/#/templates/workflow_job_template/${workflowJobTemplate.id}`;
value = strings.get('details.WEBHOOK');
} else if (createdBy) {
tooltip = strings.get('tooltips.USER');
link = `/#/users/${createdBy.id}`;
value = $filter('sanitize')(createdBy.username);
} else if (relatedSchedule && jobTemplate) {
tooltip = strings.get('tooltips.SCHEDULE');
link = `/#/templates/job_template/${jobTemplate.id}/schedules/${schedule.id}`;
value = $filter('sanitize')(schedule.name);
} else {
tooltip = null;
link = null;

4
awx/ui/client/src/workflow-results/workflow-results.partial.html
View File

@ -177,7 +177,7 @@
<!-- CREATED BY DETAIL -->
<div class="WorkflowResults-resultRow"
ng-show="workflow.summary_fields.created_by.username">
ng-show="workflow.summary_fields.created_by.username && !launched_by_webhook_link">
<label class="WorkflowResults-resultRowLabel">
{{ strings.labels.LAUNCHED_BY }}
</label>
@ -192,7 +192,7 @@
<!-- SCHEDULED BY DETAIL -->
<div class="WorkflowResults-resultRow toggle-show"
ng-show="workflow.summary_fields.schedule.name">
ng-show="workflow.summary_fields.schedule.name && !launched_by_webhook_link">
<label
class="WorkflowResults-resultRowLabel">
{{ strings.labels.LAUNCHED_BY }}