diff options
| author | Chris Houseknecht <chouse@ansibleworks.com> | 2013-11-08 19:16:52 +0100 |
|---|---|---|
| committer | Chris Houseknecht <chouse@ansibleworks.com> | 2013-11-08 19:16:52 +0100 |
| commit | 1d27f666e4f0b6f14a271f29c52c900730f456c9 (patch) | |
| tree | 00f5e374ca15ff38015775f0dfff4e303f817cd3 | |
| parent | First iteration of Activity Stream. Added Home/Groups page. Increased icon si... (diff) | |
| download | awx-1d27f666e4f0b6f14a271f29c52c900730f456c9.tar.xz awx-1d27f666e4f0b6f14a271f29c52c900730f456c9.zip | |
AC-616 Fixed date warning vs. date expired message. The CheckLicense routine now looks for date_expired flag.
| -rw-r--r-- | awx/ui/static/js/helpers/Access.js | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/awx/ui/static/js/helpers/Access.js b/awx/ui/static/js/helpers/Access.js index 5baf273f15..cdeff4d0d0 100644 --- a/awx/ui/static/js/helpers/Access.js +++ b/awx/ui/static/js/helpers/Access.js @@ -73,9 +73,10 @@ angular.module('AccessHelper', ['RestServices', 'Utilities', 'ngCookies']) 'contact <a href="mailto:info@ansibleworks.com"><strong>info@ansibleworks.com</strong></a> for assistance.'; Alert(hdr, msg, status); } - if (license['date_warning'] !== undefined && license['date_warning'] == true) { + if (license['date_expired'] !== undefined && license['date_expired'] == true) { + // expired status = 'alert-info'; - hdr = 'License Expired'; + hdr = 'AWX License Expired'; msg = 'Your AnsibleWorks AWX License has expired and is no longer compliant. ' + 'You can continue, but you will be unable to add any additional hosts. Please ' + '<a href="http://store.ansibleworks.com" target="_blank"><strong>visit the AnsibleWorks online store</strong></a> ' + @@ -83,6 +84,14 @@ angular.module('AccessHelper', ['RestServices', 'Utilities', 'ngCookies']) 'for assistance.'; Alert(hdr, msg, status); } + else if (license['date_warning'] !== undefined && license['date_warning'] == true) { + status = 'alert-info'; + hdr = 'AWX License Warning'; + msg = 'Your AnsibleWorks AWX License is about to expire. To extend your license, please ' + + '<a href="http://store.ansibleworks.com" target="_blank"><strong>visit the AnsibleWorks online store</strong></a>, or ' + + 'contact <a href="mailto:info@ansibleworks.com"><strong>info@ansibleworks.com</strong></a> for more information.'; + Alert(hdr, msg, status); + } if (license['free_instances'] !== undefined && parseInt(license['free_instances']) <= 0) { status = 'alert-info'; hdr = 'License Warning'; |