From 47bcf09a62fb260a60b90d4f6c8406d956ab5a8a Mon Sep 17 00:00:00 2001
From: "Kotta, Shireesha (sk434m)" <shireesha.kotta@att.com>
Date: Tue, 9 Oct 2018 11:28:41 -0400
Subject: Add roles to user

Issue-ID: PORTAL-432

add roles to user when the app is centralized

Change-Id: I46a782be24ea1804597dc7205bf98170731ffe4d
Signed-off-by: Kotta, Shireesha (sk434m) <shireesha.kotta@att.com>
---
 ecomp-portal-FE-common/client/app/views/role/role-list-controller.js | 4 +++-
 ecomp-portal-FE-common/client/app/views/role/role_list.html          | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'ecomp-portal-FE-common/client/app/views')

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>
-- 
cgit 1.2.3-korg