shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 15:21:13 +03:00
Code Releases Activity

Merge pull request #279 from jaredevantabor/license1

Browse Source 
update license page if user inputs a new type of license
This commit is contained in:
Jared Tabor 2017-08-15 15:09:59 -07:00 committed by GitHub
commit bdaab5e0e2
1 changed files with 4 additions and 4 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

@ -34,7 +34,7 @@ export default
document.getElementById('License-form').reset(); document.getElementById('License-form').reset();
}; };
var init = function(){ var init = function(config){
// license/license.partial.html compares fileName // license/license.partial.html compares fileName
$scope.fileName = N_("No file selected."); $scope.fileName = N_("No file selected.");
$scope.title = $rootScope.licenseMissing ? ($rootScope.BRAND_NAME + i18n._(" License")) : i18n._("License Management"); $scope.title = $rootScope.licenseMissing ? ($rootScope.BRAND_NAME + i18n._(" License")) : i18n._("License Management");
@ -47,7 +47,7 @@ export default
$scope.compliant = $scope.license.license_info.compliant; $scope.compliant = $scope.license.license_info.compliant;
}; };
init(); init(config);
$scope.getKey = function(event){ $scope.getKey = function(event){
// Mimic HTML5 spec, show filename // Mimic HTML5 spec, show filename
@ -89,7 +89,7 @@ export default
.success(function(){ .success(function(){
reset(); reset();
ConfigService.delete(); ConfigService.delete();
ConfigService.getConfig().then(function(){ ConfigService.getConfig().then(function(config){
delete($rootScope.features); delete($rootScope.features);
FeaturesService.get(); FeaturesService.get();
pendoService.issuePendoIdentity(); pendoService.issuePendoIdentity();
@ -99,7 +99,7 @@ export default
}); });
} }
else{ else{
init(); init(config);
$scope.success = true; $scope.success = true;
$rootScope.licenseMissing = false; $rootScope.licenseMissing = false;
// for animation purposes // for animation purposes