From e701857594fbd444b2f813a5a978508098983f7b Mon Sep 17 00:00:00 2001 From: Chris Houseknecht Date: Tue, 5 Nov 2013 21:33:47 +0000 Subject: [PATCH] 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. --- awx/ui/static/less/ansible-ui.less | 2 +- awx/ui/static/lib/ansible/license.js | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/awx/ui/static/less/ansible-ui.less b/awx/ui/static/less/ansible-ui.less index 994ca5a22c..60fa49d480 100644 --- a/awx/ui/static/less/ansible-ui.less +++ b/awx/ui/static/less/ansible-ui.less @@ -847,7 +847,7 @@ input[type="checkbox"].checkbox-no-label { font-size: 14px; } - .license-warning + .license-warning, .license-demo { color: @warning; } diff --git a/awx/ui/static/lib/ansible/license.js b/awx/ui/static/lib/ansible/license.js index bb12424be6..959ff95ae7 100644 --- a/awx/ui/static/lib/ansible/license.js +++ b/awx/ui/static/lib/ansible/license.js @@ -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';