* ============LICENSE_START==========================================
* ONAP Portal
* ===================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
* ===================================================================
*
* Unless otherwise specified, all software contained herein is licensed
$scope.syncRolesFromExternalAuthSystem = function(appId){
applicationsService.syncRolesEcompFromExtAuthSystem(appId).then(function(res){
- if(res.status == 200){
+ if(res.data != null || res.data.status != null || res.data.status == 'OK'){
confirmBoxService.showInformation('Sync operation completed successfully!').then(isConfirmed => {
$scope.getRolesForSelectedCentralizedApp(appId);
});
} else{
- confirmBoxService.showInformation('Sync operation failed for '+app).then(isConfirmed => {});
+ confirmBoxService.showInformation('Sync operation failed for '+app + res.data.message).then(isConfirmed => {});
}
- });
+ }).catch(err=> {
+ confirmBoxService.showInformation("Sync operation failed for: " + err);
+ });
};
// edit Role
$scope.editRoleModalPopup = function(appId, availableRole) {
+ $scope.showSpinner = true;
+ if(!availableRole.active)
+ return confirmBoxService.showInformation('Edit is diabled! Please toggle the role to activate it.').then(isConfirmed => {});
$scope.editRole = availableRole;
if(appId != undefined && availableRole.id != undefined){
- RoleService.getRole(appId, availableRole.id).then(function(data){
+ RoleService.getRole(appId, availableRole.id).then(function(data){
+ $scope.showSpinner = false;
var response = JSON.parse(data.data);
var role = JSON.parse(response.role);
var availableRoles = JSON.parse(response.availableRoles);
});
},function(error){
$log.debug('Failed to editRole');
+ $scope.showSpinner = false;
});
}
// add Role
$scope.addRoleModalPopup = function(appId) {
+ $scope.showSpinner = true;
if(appId){
- var roleId = 0;
+ var roleId = -1;
RoleService.getRole(appId, roleId).then(function(data){
+ $scope.showSpinner = false;
var response = JSON.parse(data.data);
var role = JSON.parse(response.role);
var availableRoles = JSON.parse(response.availableRoles);