Code Review
/
portal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fix sql injection vulnerability"
[portal.git]
/
ecomp-portal-FE-common
/
client
/
app
/
views
/
role
/
role-list-controller.js
diff --git
a/ecomp-portal-FE-common/client/app/views/role/role-list-controller.js
b/ecomp-portal-FE-common/client/app/views/role/role-list-controller.js
index
acfb25e
..
b481311
100644
(file)
--- a/
ecomp-portal-FE-common/client/app/views/role/role-list-controller.js
+++ b/
ecomp-portal-FE-common/client/app/views/role/role-list-controller.js
@@
-2,7
+2,7
@@
* ============LICENSE_START==========================================
* ONAP Portal
* ===================================================================
* ============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
* ===================================================================
*
* Unless otherwise specified, all software contained herein is licensed
@@
-170,14
+170,16
@@
app.controller('roleListController', function ($scope,RoleService, applicationsS
$scope.syncRolesFromExternalAuthSystem = function(appId){
applicationsService.syncRolesEcompFromExtAuthSystem(appId).then(function(res){
$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 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);
+ });
};
};
@@
-217,9
+219,13
@@
app.controller('roleListController', function ($scope,RoleService, applicationsS
// edit Role
$scope.editRoleModalPopup = function(appId, availableRole) {
// 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){
$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);
var response = JSON.parse(data.data);
var role = JSON.parse(response.role);
var availableRoles = JSON.parse(response.availableRoles);
@@
-249,6
+255,7
@@
app.controller('roleListController', function ($scope,RoleService, applicationsS
});
},function(error){
$log.debug('Failed to editRole');
});
},function(error){
$log.debug('Failed to editRole');
+ $scope.showSpinner = false;
});
}
});
}
@@
-256,9
+263,11
@@
app.controller('roleListController', function ($scope,RoleService, applicationsS
// add Role
$scope.addRoleModalPopup = function(appId) {
// add Role
$scope.addRoleModalPopup = function(appId) {
+ $scope.showSpinner = true;
if(appId){
if(appId){
- var roleId =
0
;
+ var roleId =
-1
;
RoleService.getRole(appId, roleId).then(function(data){
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);
var response = JSON.parse(data.data);
var role = JSON.parse(response.role);
var availableRoles = JSON.parse(response.availableRoles);