diff --git a/src/app/model/userrole.ts b/src/app/model/userrole.ts index 08540a2..ee06e84 100644 --- a/src/app/model/userrole.ts +++ b/src/app/model/userrole.ts @@ -17,10 +17,11 @@ export function RoleAware(constructor: Function) { export class UserRole { public domainId: number = undefined; + public domainName: string = undefined; public role: Role = undefined; - constructor(domainId?: number, role?: Role) { + constructor(domainId?: number, domainName?: string, role?: Role) { this.domainId = domainId; this.role = role; } diff --git a/src/app/service/user.service.ts b/src/app/service/user.service.ts index ed9f281..66db21d 100644 --- a/src/app/service/user.service.ts +++ b/src/app/service/user.service.ts @@ -56,7 +56,7 @@ export class UserService extends GenericDataService { const url: string = (domainId === undefined ? this.getUsersUrl() : this.getDomainUsersUrl(domainId)) + userId + '/roles'; const targetDomainId: number = (domainId === undefined ? this.appConfig.getNmaasGlobalDomainId() : domainId); - return this.post(url, new UserRole(targetDomainId, role)); + return this.post(url, new UserRole(targetDomainId, undefined, role)); } public removeRole(userId: number, role: Role, domainId?: number): Observable { diff --git a/src/app/shared/users/privileges/userprivileges.component.html b/src/app/shared/users/privileges/userprivileges.component.html index 59aaade..b632b0f 100644 --- a/src/app/shared/users/privileges/userprivileges.component.html +++ b/src/app/shared/users/privileges/userprivileges.component.html @@ -48,7 +48,7 @@ - {{getDomainName(userrole.domainId)|async}} + {{userrole.domainName}} {{"ENUM.USER_ROLES." + userrole.role.toUpperCase() | translate}}