Merge pull request #5410 from mabashian/5404-ask-checkboxes-credential

Wait to update checkboxes until the credential data is on scope
This commit is contained in:
Michael Abashian 2017-02-17 09:54:27 -05:00 committed by GitHub
commit 69300b83c6

View File

@ -349,7 +349,6 @@ export function CredentialsEdit($scope, $rootScope, $compile, $location, $log,
}
});
setAskCheckboxes();
OwnerChange({ scope: $scope });
$scope.$watch("ssh_key_data", function(val) {
if (val === "" || val === null || val === undefined) {
@ -498,6 +497,8 @@ export function CredentialsEdit($scope, $rootScope, $compile, $location, $log,
}
$scope.credential_obj = data;
setAskCheckboxes();
$scope.$emit('credentialLoaded');
Wait('stop');
})