From 2414c23be391925e439e2acb8fb39d08d1d8f410 Mon Sep 17 00:00:00 2001
From: kbeyro <121854496+kbeyro@users.noreply.github.com>
Date: Mon, 14 Apr 2025 10:29:10 +0200
Subject: [PATCH 1/2] fix user call based on mode
---
.../shared/users/list/userslist.component.ts | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/app/shared/users/list/userslist.component.ts b/src/app/shared/users/list/userslist.component.ts
index 7394575d..1ae3116b 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> {
--
GitLab
From 80d8c5424cb915ed9cb254de69658f68e33af808 Mon Sep 17 00:00:00 2001
From: kbeyro <121854496+kbeyro@users.noreply.github.com>
Date: Mon, 14 Apr 2025 10:42:59 +0200
Subject: [PATCH 2/2] add group domain admin
---
src/app/appmarket/appdetails/appdetails.component.ts | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/app/appmarket/appdetails/appdetails.component.ts b/src/app/appmarket/appdetails/appdetails.component.ts
index e5518794..cb156314 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 {
--
GitLab