diff --git a/public/site/templates/projects.json.php b/public/site/templates/projects.json.php index 542ee7e..6f589eb 100644 --- a/public/site/templates/projects.json.php +++ b/public/site/templates/projects.json.php @@ -44,9 +44,12 @@ function getProjectData($project, $user) $currentUser = $kirby->user(); try { - $children = $currentUser->role() == 'admin' - ? $page->childrenAndDrafts()->map(fn($project) => getProjectData($project, $currentUser))->values() - : $currentUser->currentProjects()->map(fn($project) => getProjectData($project, $currentUser))->values(); + if ($currentUser->role() == 'admin' && $currentUser->hasNoAssignedProjects()) { + $projectCollection = $page->childrenAndDrafts(); + } else { + $projectCollection = $currentUser->currentProjects()->merge($currentUser->archivedProjects()); + } + $children = $projectCollection->map(fn($project) => getProjectData($project, $currentUser))->values(); } catch (\Throwable $th) { throw new Exception($th->getMessage() . ' line ' . $th->getLine() . ' in file ' . $th->getFile(), 1); $children = [];