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

Merge pull request #6162 from cchurch/fix_license_expires_on

Browse Source 
Fix license expires on date
This commit is contained in:
Michael Abashian 2017-05-16 08:22:27 -04:00 committed by GitHub
commit d304347312
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui/client/src/license/license.controller.js
View File

@ -25,11 +25,9 @@ export default
return duration;
};
var calcExpiresOn = function(days){
var calcExpiresOn = function(seconds){
// calculate the expiration date of the license
days = parseInt(days);
return moment().add(days, 'days').calendar();
return moment.unix(seconds).calendar();
};
var reset = function(){
@ -47,7 +45,7 @@ export default
$scope.license.version = config.version.split('-')[0];
$scope.time = {};
$scope.time.remaining = calcDaysRemaining($scope.license.license_info.time_remaining);
$scope.time.expiresOn = calcExpiresOn($scope.time.remaining);
$scope.time.expiresOn = calcExpiresOn($scope.license.license_info.license_date);
$scope.valid = CheckLicense.valid($scope.license.license_info);
$scope.compliant = $scope.license.license_info.compliant;
Wait('stop');