diff options
author | 2020-04-01 14:14:20 +0000 | |
---|---|---|
committer | 2020-04-01 14:14:20 +0000 | |
commit | 36703953572a86f06db6c60285a3b3d358aa674c (patch) | |
tree | b102eb051ce706d85fd41ce9452a1462efad0c76 /portal-FE-common/src | |
parent | c97140ca11335db9b856c44044c9f5a07f74145a (diff) | |
parent | 72bff4d6db3a055c453b76ef82f0ec013edf55ca (diff) |
Merge "Changes made for Role assignment"
Diffstat (limited to 'portal-FE-common/src')
-rw-r--r-- | portal-FE-common/src/app/pages/users/users.component.ts | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/portal-FE-common/src/app/pages/users/users.component.ts b/portal-FE-common/src/app/pages/users/users.component.ts index 23538b5f..935be921 100644 --- a/portal-FE-common/src/app/pages/users/users.component.ts +++ b/portal-FE-common/src/app/pages/users/users.component.ts @@ -2,7 +2,7 @@ * ============LICENSE_START========================================== * ONAP Portal * =================================================================== - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. * =================================================================== * * Unless otherwise specified, all software contained herein is licensed @@ -93,7 +93,19 @@ export class UsersComponent implements OnInit { openExistingUserModal(userData: any) { const modalRef = this.ngbModal.open(NewUserModalComponent); - modalRef.componentInstance.userTitle = `${userData.firstName}, ${userData.lastName} ` + '(' + `${userData.orgUserId}` + ')'; + let firstName = ''; + let lastName = ''; + let orgUserId = ''; + if(userData && userData.firstName && userData.firstName!=null){ + firstName = userData.firstName; + } + if(userData && userData.lastName && userData.lastName!=null){ + lastName = ',' + userData.lastName; + } + if(userData && userData.orgUserId && userData.orgUserId!=null){ + orgUserId = ' (' +userData.orgUserId + ')'; + } + modalRef.componentInstance.userTitle = `${firstName} ${lastName} ${orgUserId}` ; modalRef.componentInstance.dialogState = 2; modalRef.componentInstance.userModalData = userData; modalRef.componentInstance.disableBack = true; |