From 472a44baeaaf1fc6ab2e597ebe82c32c22133512 Mon Sep 17 00:00:00 2001 From: trendschau Date: Tue, 10 Sep 2024 15:01:54 +0200 Subject: [PATCH] v2.9 fix error with hidden folders and remove unpublished pages from folderContent in item --- content/00-getting-started/index.yaml | 2 +- .../typemill/Controllers/ControllerWebFrontend.php | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/content/00-getting-started/index.yaml b/content/00-getting-started/index.yaml index d8898ce..8e1b6b4 100644 --- a/content/00-getting-started/index.yaml +++ b/content/00-getting-started/index.yaml @@ -7,7 +7,7 @@ meta: modified: '2024-05-17' created: '2024-04-25' time: 13-16-58 - hide: false + hide: true noindex: false contains: pages template: '' diff --git a/system/typemill/Controllers/ControllerWebFrontend.php b/system/typemill/Controllers/ControllerWebFrontend.php index 7d7ef6b..17549d6 100644 --- a/system/typemill/Controllers/ControllerWebFrontend.php +++ b/system/typemill/Controllers/ControllerWebFrontend.php @@ -106,10 +106,18 @@ class ControllerWebFrontend extends Controller $liveNavigation = $this->c->get('dispatcher')->dispatch(new OnPagetreeLoaded($liveNavigation), 'onPagetreeLoaded')->getData(); # For FOLDERS use item without drafts and hidden pages - if(!$home && $item->elementType == 'folder' && !$item->hide) + if(!$home && $item->elementType == 'folder') { - # $item = $navigation->getItemWithUrl($liveNavigation, $item->urlRelWoF); - $item = $navigation->getItemWithKeyPath($liveNavigation, $item->keyPathArray); + # if folder itself is not hidden + if($item->hide && count($item->folderContent) > 0) + { + $item->folderContent = $navigation->generateLiveNavigationFromDraft($item->folderContent); + } + else + { + # $item = $navigation->getItemWithUrl($liveNavigation, $item->urlRelWoF); + $item = $navigation->getItemWithKeyPath($liveNavigation, $item->keyPathArray); + } } # ADD BACKWARD-/FORWARD PAGINATION