From 22a4279615bf349bc75ed88016a6b115dcbbd003 Mon Sep 17 00:00:00 2001
From: Chris Church <chris@ninemoreminutes.com>
Date: Tue, 2 May 2017 15:35:49 -0400
Subject: [PATCH] Fix license expires on to use license_date instead of number
 of days remaining.

---
 awx/ui/client/src/license/license.controller.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/awx/ui/client/src/license/license.controller.js b/awx/ui/client/src/license/license.controller.js
index c1d5cdb65a..2cd07a5300 100644
--- a/awx/ui/client/src/license/license.controller.js
+++ b/awx/ui/client/src/license/license.controller.js
@@ -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');