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

Adds environment to output details for jts and inv syncs

Browse Source
This commit is contained in:
mabashian 2019-01-24 12:19:24 -05:00
parent 51b51a9bf7
commit 8037cddfe5
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,6 +113,18 @@ function getVerbosityDetails () {
return { label, value };
}
function getEnvironmentDetails () {
const value = resource.model.get('custom_virtualenv');
if (!value || value === '') {
return null;
}
const label = strings.get('labels.ENVIRONMENT');
return { label, value };
}
function getSourceWorkflowJobDetails () {
const sourceWorkflowJob = resource.model.get('summary_fields.source_workflow_job');
@ -711,6 +723,7 @@ function JobDetailsController (
vm.launchedBy = getLaunchedByDetails();
vm.jobExplanation = getJobExplanationDetails();
vm.verbosity = getVerbosityDetails();
vm.environment = getEnvironmentDetails();
vm.credentials = getCredentialDetails();
vm.forks = getForkDetails();
vm.limit = getLimitDetails();
@ -735,11 +748,12 @@ function JobDetailsController (
vm.toggleLabels = toggleLabels;
vm.showLabels = showLabels;
unsubscribe = subscribe(({ status, started, finished, scm }) => {
unsubscribe = subscribe(({ status, started, finished, scm, environment }) => {
vm.started = getStartDetails(started);
vm.finished = getFinishDetails(finished);
vm.projectUpdate = getProjectUpdateDetails(scm.id);
vm.projectStatus = getProjectStatusDetails(scm.status);
vm.environment = getEnvironmentDetails(environment);
vm.status = getStatusDetails(status);
vm.job.status = status;
});

6
awx/ui/client/features/output/details.partial.html
View File

@ -268,6 +268,12 @@
<div class="JobResults-resultRowText">{{ vm.verbosity.value }}</div>
</div>
<!-- ENVIRONMENT DETAIL -->
<div class="JobResults-resultRow" ng-if="vm.environment">
<label class="JobResults-resultRowLabel">{{ vm.environment.label }}</label>
<div class="JobResults-resultRowText">{{ vm.environment.value }}</div>
</div>
<!-- IG DETAIL -->
<div class="JobResults-resultRow" ng-if="vm.instanceGroup">
<label class="JobResults-resultRowLabel">{{ vm.instanceGroup.label }}</label>

1
awx/ui/client/features/output/output.strings.js
View File

@ -48,6 +48,7 @@ function OutputStrings (BaseString) {
ns.labels = {
CREDENTIAL: t.s('Credential'),
ENVIRONMENT: t.s('Environment'),
EXTRA_VARS: t.s('Extra Variables'),
FINISHED: t.s('Finished'),
FORKS: t.s('Forks'),