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

problem with version on About Tower and View License

Browse Source
This commit is contained in:
Jared Tabor
2014-08-12 10:20:23 -04:00
parent 620fc56f57
commit a38bb7c79c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/static/js/helpers/AboutAnsible.js
View File

@@ -44,7 +44,7 @@ angular.module('AboutAnsibleHelpModal', ['RestServices', 'Utilities','ModalDialo
scope.removeBuildAboutDialog = scope.$on('BuildAboutDialog', function(e, data) { scope.removeBuildAboutDialog = scope.$on('BuildAboutDialog', function(e, data) {
var spaces, i, j, var spaces, i, j,
paddedStr = "", paddedStr = "",
version = data.version.replace(/-\d*$/,''); version = data.version.replace(/-.*$/,'');
spaces = Math.floor((16-version.length)/2); spaces = Math.floor((16-version.length)/2);
for( i=0; i<=spaces; i++){ for( i=0; i<=spaces; i++){

2
awx/ui/static/js/helpers/License.js
View File

@@ -537,7 +537,7 @@ function ($location, $rootScope, $compile, $filter, GenerateForm, Rest, Alert, G
} }
scope.removeLicenseDataReady = scope.$on('LicenseDataReady', function(e, data) { scope.removeLicenseDataReady = scope.$on('LicenseDataReady', function(e, data) {
var html, version; var html, version;
version = data.version.replace(/-\d*$/,''); version = data.version.replace(/-.*$/,'');
self.setLicense(data.license_info, version); self.setLicense(data.license_info, version);
html = self.getDefaultHTML(data.license_info); html = self.getDefaultHTML(data.license_info);
self.loadDefaultScope(data.license_info, version); self.loadDefaultScope(data.license_info, version);