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

Fix display on License Expiration resolves #1250 (#1860)

Browse Source 
* API returns s, not ms! resolves #1250

* License - fix mixed tabs/spaces, move save successful message
This commit is contained in:
Leigh
2016-05-09 14:26:07 -04:00
parent 11e9792356
commit 268baa6b9b
2 changed files with 84 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,9 +62,9 @@ export default
} }
}); });
}; };
var calcDaysRemaining = function(ms){ var calcDaysRemaining = function(seconds){
// calculate the number of days remaining on the license // calculate the number of days remaining on the license
var duration = moment.duration(ms); var duration = moment.duration(seconds, 'seconds');
return duration.days(); return duration.days();
}; };

2
awx/ui/client/src/license/license.partial.html
View File

@@ -118,8 +118,8 @@
</div> </div>
</div> </div>
<div class="License-submit--container"> <div class="License-submit--container">
<span ng-show="success == true" class="License-greenText License-submit--success pull-left">Save successful!</span>
<button ng-click="submit()" class="btn btn-success pull-right" ng-disabled="newLicense.file.license_key == null || newLicense.eula == null">Submit</button> <button ng-click="submit()" class="btn btn-success pull-right" ng-disabled="newLicense.file.license_key == null || newLicense.eula == null">Submit</button>
<span ng-show="success == true" class="License-greenText License-submit--success pull-right">Save successful!</span>
</div> </div>
</form> </form>
</div> </div>