mirror of
https://github.com/ansible/awx.git
synced 2026-05-08 01:47:35 -02:30
Adds environment to output details for jts and inv syncs
This commit is contained in:
@@ -113,6 +113,18 @@ function getVerbosityDetails () {
|
|||||||
return { label, value };
|
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 () {
|
function getSourceWorkflowJobDetails () {
|
||||||
const sourceWorkflowJob = resource.model.get('summary_fields.source_workflow_job');
|
const sourceWorkflowJob = resource.model.get('summary_fields.source_workflow_job');
|
||||||
|
|
||||||
@@ -711,6 +723,7 @@ function JobDetailsController (
|
|||||||
vm.launchedBy = getLaunchedByDetails();
|
vm.launchedBy = getLaunchedByDetails();
|
||||||
vm.jobExplanation = getJobExplanationDetails();
|
vm.jobExplanation = getJobExplanationDetails();
|
||||||
vm.verbosity = getVerbosityDetails();
|
vm.verbosity = getVerbosityDetails();
|
||||||
|
vm.environment = getEnvironmentDetails();
|
||||||
vm.credentials = getCredentialDetails();
|
vm.credentials = getCredentialDetails();
|
||||||
vm.forks = getForkDetails();
|
vm.forks = getForkDetails();
|
||||||
vm.limit = getLimitDetails();
|
vm.limit = getLimitDetails();
|
||||||
@@ -735,11 +748,12 @@ function JobDetailsController (
|
|||||||
vm.toggleLabels = toggleLabels;
|
vm.toggleLabels = toggleLabels;
|
||||||
vm.showLabels = showLabels;
|
vm.showLabels = showLabels;
|
||||||
|
|
||||||
unsubscribe = subscribe(({ status, started, finished, scm }) => {
|
unsubscribe = subscribe(({ status, started, finished, scm, environment }) => {
|
||||||
vm.started = getStartDetails(started);
|
vm.started = getStartDetails(started);
|
||||||
vm.finished = getFinishDetails(finished);
|
vm.finished = getFinishDetails(finished);
|
||||||
vm.projectUpdate = getProjectUpdateDetails(scm.id);
|
vm.projectUpdate = getProjectUpdateDetails(scm.id);
|
||||||
vm.projectStatus = getProjectStatusDetails(scm.status);
|
vm.projectStatus = getProjectStatusDetails(scm.status);
|
||||||
|
vm.environment = getEnvironmentDetails(environment);
|
||||||
vm.status = getStatusDetails(status);
|
vm.status = getStatusDetails(status);
|
||||||
vm.job.status = status;
|
vm.job.status = status;
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -268,6 +268,12 @@
|
|||||||
<div class="JobResults-resultRowText">{{ vm.verbosity.value }}</div>
|
<div class="JobResults-resultRowText">{{ vm.verbosity.value }}</div>
|
||||||
</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 -->
|
<!-- IG DETAIL -->
|
||||||
<div class="JobResults-resultRow" ng-if="vm.instanceGroup">
|
<div class="JobResults-resultRow" ng-if="vm.instanceGroup">
|
||||||
<label class="JobResults-resultRowLabel">{{ vm.instanceGroup.label }}</label>
|
<label class="JobResults-resultRowLabel">{{ vm.instanceGroup.label }}</label>
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ function OutputStrings (BaseString) {
|
|||||||
|
|
||||||
ns.labels = {
|
ns.labels = {
|
||||||
CREDENTIAL: t.s('Credential'),
|
CREDENTIAL: t.s('Credential'),
|
||||||
|
ENVIRONMENT: t.s('Environment'),
|
||||||
EXTRA_VARS: t.s('Extra Variables'),
|
EXTRA_VARS: t.s('Extra Variables'),
|
||||||
FINISHED: t.s('Finished'),
|
FINISHED: t.s('Finished'),
|
||||||
FORKS: t.s('Forks'),
|
FORKS: t.s('Forks'),
|
||||||
|
|||||||
Reference in New Issue
Block a user