External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-22 00:07:40 -02:30
Code Issues Packages Projects Releases Wiki Activity

AC-934: Hide license date and time remaining when AWS.

Browse Source
This commit is contained in:
chris Houseknecht
2014-01-15 02:29:22 -05:00
parent 46e5e078b6
commit 298e55017f
1 changed files with 48 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,8 +9,8 @@
angular.module('License', ['RestServices', 'Utilities', 'FormGenerator', 'PromptDialog']) angular.module('License', ['RestServices', 'Utilities', 'FormGenerator', 'PromptDialog'])
.factory('ViewLicense', ['$location', '$rootScope', 'GenerateForm', 'Rest', 'Alert', 'GetBasePath', 'ProcessErrors', .factory('ViewLicense', ['$location', '$rootScope', 'GenerateForm', 'Rest', 'Alert', 'GetBasePath', 'ProcessErrors',
'FormatDate', 'Prompt', 'FormatDate', 'Prompt', 'Empty',
function($location, $rootScope, GenerateForm, Rest, Alert, GetBasePath, ProcessErrors, FormatDate, Prompt) { function($location, $rootScope, GenerateForm, Rest, Alert, GetBasePath, ProcessErrors, FormatDate, Prompt, Empty) {
return function() { return function() {
var defaultUrl=GetBasePath('config'); var defaultUrl=GetBasePath('config');
@@ -90,27 +90,20 @@ angular.module('License', ['RestServices', 'Utilities', 'FormGenerator', 'Prompt
var base = $location.path().replace(/^\//,'').split('/')[0]; var base = $location.path().replace(/^\//,'').split('/')[0];
function empty(x) {
var result = false;
if (x != 0 && (x === null || x === undefined || x == '') ) {
result = true;
}
return result;
}
// Retrieve detail record and prepopulate the form // Retrieve detail record and prepopulate the form
Rest.setUrl(defaultUrl); Rest.setUrl(defaultUrl);
Rest.get() Rest.get()
.success( function(data, status, headers, config) { .success( function(data, status, headers, config) {
for (var fld in form.fields) { for (var fld in form.fields) {
if (fld != 'time_remaining' && fld != 'license_status') { if (fld != 'time_remaining' && fld != 'license_status') {
if (empty(data['license_info'][fld])) { if (Empty(data['license_info'][fld])) {
delete form.fields[fld]; delete form.fields[fld];
} }
} }
} }
if (empty(data['license_info']['license_date'])) { if (data['license_info']['is_aws'] || Empty(data['license_info']['license_date'])) {
delete form.fields['license_date']; delete form.fields['license_date'];
delete form.fields['time_remaining']; delete form.fields['time_remaining'];
} }
@@ -125,10 +118,12 @@ angular.module('License', ['RestServices', 'Utilities', 'FormGenerator', 'Prompt
scope.formModalActionLabel = 'OK'; scope.formModalActionLabel = 'OK';
scope.formModalCancelShow = false; scope.formModalCancelShow = false;
scope.formModalInfo = 'Purchase/Extend License'; scope.formModalInfo = 'Purchase/Extend License';
$('#form-modal .btn-success').removeClass('btn-success').addClass('btn-none');
$('#form-modal').addClass('skinny-modal');
scope.formModalHeader = 'AWX License'; scope.formModalHeader = 'AWX License';
//$('#form-modal .btn-success').removeClass('btn-success').addClass('btn-none');
//$('#form-modal').addClass('skinny-modal');
// Respond to license button // Respond to license button
scope.formModalInfoAction = function() { scope.formModalInfoAction = function() {
Prompt({ Prompt({
@@ -145,7 +140,7 @@ angular.module('License', ['RestServices', 'Utilities', 'FormGenerator', 'Prompt
} }
for (var fld in form.fields) { for (var fld in form.fields) {
if (data['license_info'][fld] !== undefined) { if (!Empty(data['license_info'][fld])) {
scope[fld] = data['license_info'][fld]; scope[fld] = data['license_info'][fld];
} }
} }