External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-28 00:08:44 -03:30
Code Issues Packages Projects Releases Wiki Activity

show license error details

Browse Source
This commit is contained in:
Jake McDermott
2018-05-09 19:38:51 -04:00
parent 4355b30afe
commit e19ffc1fba
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -216,6 +216,17 @@ function getOverwriteVarsDetails () {
return { label, value }; return { label, value };
} }
function getLicenseErrorDetails () {
if (!resource.model.has('license_error')) {
return null;
}
const label = 'License Error';
const value = resource.model.get('license_error');
return { label, value };
}
function getLaunchedByDetails () { function getLaunchedByDetails () {
const createdBy = resource.model.get('summary_fields.created_by'); const createdBy = resource.model.get('summary_fields.created_by');
const jobTemplate = resource.model.get('summary_fields.job_template'); const jobTemplate = resource.model.get('summary_fields.job_template');
@@ -682,6 +693,7 @@ function JobDetailsController (
vm.inventorySource = getInventorySourceDetails(); vm.inventorySource = getInventorySourceDetails();
vm.overwrite = getOverwriteDetails(); vm.overwrite = getOverwriteDetails();
vm.overwriteVars = getOverwriteVarsDetails(); vm.overwriteVars = getOverwriteVarsDetails();
vm.licenseError = getLicenseErrorDetails();
// Relaunch and Delete Components // Relaunch and Delete Components
vm.job = angular.copy(_.get(resource.model, 'model.GET', {})); vm.job = angular.copy(_.get(resource.model, 'model.GET', {}));

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

@@ -84,6 +84,14 @@
</div> </div>
</div> </div>
<!-- LICENSE ERROR DETAIL -->
<div class="JobResults-resultRow" ng-show="vm.licenseError">
<label class="JobResults-resultRowLabel">{{ vm.licenseError.label }}</label>
<div class="JobResults-resultRowText">
{{ vm.licenseError.value }}
</div>
</div>
<!-- START TIME DETAIL --> <!-- START TIME DETAIL -->
<div class="JobResults-resultRow" ng-if="vm.started"> <div class="JobResults-resultRow" ng-if="vm.started">
<label class="JobResults-resultRowLabel">{{ vm.started.label }}</label> <label class="JobResults-resultRowLabel">{{ vm.started.label }}</label>