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

AC-563 license check now responds to date_expired and date_warning flags. Prior to this it treated date_warning as if the date had expired.

Browse Source
This commit is contained in:
Chris Houseknecht 2013-11-05 21:33:47 +00:00
parent 6c2ea0a7bb
commit e701857594
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/static/less/ansible-ui.less
View File

@ -847,7 +847,7 @@ input[type="checkbox"].checkbox-no-label {
font-size: 14px;
}
.license-warning
.license-warning,
.license-demo {
color: @warning;
}

6
awx/ui/static/lib/ansible/license.js
View File

@ -186,10 +186,14 @@ angular.module('License', ['RestServices', 'Utilities', 'FormGenerator', 'Prompt
scope['license_status'] = 'Demo';
scope['status_color'] = 'license-demo';
}
else if (license['date_warning'] !== undefined && license['date_warning'] == true) {
else if (license['date_expired'] !== undefined && license['date_expired'] == true) {
scope['license_status'] = 'Expired';
scope['status_color'] = 'license-expired';
}
else if (license['date_warning'] !== undefined && license['date_warning'] == true) {
scope['license_status'] = 'Expiration Warning';
scope['status_color'] = 'license-warning';
}
else if (license['free_instances'] !== undefined && parseInt(license['free_instances']) <= 0) {
scope['license_status'] = 'No available managed hosts';
scope['status_color'] = 'license-invalid';