diff --git a/src/app/appmarket/appdetails/appdetails.component.ts b/src/app/appmarket/appdetails/appdetails.component.ts index e5518794a0850eb436fcafbe67025c1e78c33d75..cb156314c0447fa5f6e4530551266420d105368f 100644 --- a/src/app/appmarket/appdetails/appdetails.component.ts +++ b/src/app/appmarket/appdetails/appdetails.component.ts @@ -146,7 +146,8 @@ export class AppDetailsComponent implements OnInit { } return this.authService.hasRole(Role[Role.ROLE_SYSTEM_ADMIN]) - || this.authService.hasDomainRole(this.domainId, Role[Role.ROLE_DOMAIN_ADMIN]); + || this.authService.hasDomainRole(this.domainId, Role[Role.ROLE_DOMAIN_ADMIN]) + || this.authService.hasDomainRole(this.domainId, Role[Role.ROLE_GROUP_DOMAIN_ADMIN]); } public isApplicationEnabledInDomain(): boolean { diff --git a/src/app/shared/users/list/userslist.component.ts b/src/app/shared/users/list/userslist.component.ts index 7394575d57a4f6d527893ff57c82ad1d4d71b007..1ae3116b57b2d986b67eaaef9d6ca6a47f96d777 100644 --- a/src/app/shared/users/list/userslist.component.ts +++ b/src/app/shared/users/list/userslist.component.ts @@ -101,11 +101,20 @@ export class UsersListComponent extends BaseComponent implements OnInit, OnChang } public getAllDomain() { - this.domainService.getAll().subscribe(domains => { - domains.forEach(domain => { - this.domainCache.setData(domain.id, domain) + if(this.domainMode) { + this.domainService.getMyDomains().subscribe(domains => { + domains.forEach(domain => { + this.domainCache.setData(domain.id, domain) + } + ) }) + } else { + this.domainService.getAll().subscribe(domains => { + domains.forEach(domain => { + this.domainCache.setData(domain.id, domain) + }) }) - }) + } + } public getDomainName(domainId: number): Observable<string> {