Merge branch '1.3' into 2.x

lukmzig · lukmzig · commit e2a1f9bc4096 · 2025-04-15T08:00:31.000+02:00
diff --git a/src/Service/Permission/PermissionService.php b/src/Service/Permission/PermissionService.php
@@ -216,6 +216,10 @@ private function getPermissionsFromWorkspaces(
             return $this->workspaceService->getDeepestWorkspace($userWorkspaces)->getPermissions();
         }
 
+        if (empty($userWorkspaces)) {
+            return $this->workspaceService->getDeepestWorkspace($roleWorkspaces)->getPermissions();
+        }
+
         $userWorkspace = $this->workspaceService->getDeepestWorkspace($userWorkspaces);
         $roleWorkspace = $this->workspaceService->getDeepestWorkspace($roleWorkspaces);
 

Original file line number	Diff line number	Diff line change
`@@ -216,6 +216,10 @@ private function getPermissionsFromWorkspaces(`
`216`	`216`	`return $this->workspaceService->getDeepestWorkspace($userWorkspaces)->getPermissions();`
`217`	`217`	`}`
`218`	`218`
	`219`	`+ if (empty($userWorkspaces)) {`
	`220`	`+ return $this->workspaceService->getDeepestWorkspace($roleWorkspaces)->getPermissions();`
	`221`	`+ }`
	`222`	`+`
`219`	`223`	`$userWorkspace = $this->workspaceService->getDeepestWorkspace($userWorkspaces);`
`220`	`224`	`$roleWorkspace = $this->workspaceService->getDeepestWorkspace($roleWorkspaces);`
`221`	`225`