diff options
| author |   Manoop Talasila <talasila@research.att.com> | 2018-10-09 21:33:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-10-09 21:33:46 +0000 |
| commit | 3df71561a2d7577d36f9d777f4cb66ae3f52cc47 (patch) | |
| tree | 6951e0ced0ea45e09a0bc138d4c760e5f299397a /ecomp-portal-FE-common/client/app/views | |
| parent | c562e26bcd8f9147fd24ca4da9c5dfe7caea0199 (diff) | |
| parent | 47bcf09a62fb260a60b90d4f6c8406d956ab5a8a (diff) | |
Merge "Add roles to user"
Diffstat (limited to 'ecomp-portal-FE-common/client/app/views')
| -rw-r--r-- | ecomp-portal-FE-common/client/app/views/role/role-list-controller.js | 4 | ||||
| -rw-r--r-- | ecomp-portal-FE-common/client/app/views/role/role_list.html | 2 |
2 files changed, 4 insertions, 2 deletions
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 acfb25e0..0ae218c4 100644 --- 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 * =================================================================== - * 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 @@ -217,6 +217,8 @@ app.controller('roleListController', function ($scope,RoleService, applicationsS // edit Role $scope.editRoleModalPopup = function(appId, availableRole) { + if(!availableRole.active) + return confirmBoxService.showInformation('Edit is disabled! 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){ diff --git a/ecomp-portal-FE-common/client/app/views/role/role_list.html b/ecomp-portal-FE-common/client/app/views/role/role_list.html index b082c3ea..34244b5f 100644 --- a/ecomp-portal-FE-common/client/app/views/role/role_list.html +++ b/ecomp-portal-FE-common/client/app/views/role/role_list.html @@ -93,7 +93,7 @@ </div> </td> <td b2b-table-body id="{{$index}}-button-edit-role" class="icon-misc-pen" ng-click="editRoleModalPopup(apps.selectedCentralizedApp, rowData)"></td> - <td ng-if="apps.selectedCentralizedApp != 1" b2b-table-body class="icon-trash" ng-click="removeRole(apps.selectedCentralizedApp, rowData)"></td> + <td ng-if="apps.selectedCentralizedApp != 1" b2b-table-body class="icon-misc-trash" ng-click="removeRole(apps.selectedCentralizedApp, rowData)"></td> </tr> </tbody> </table> |