diff --git a/content/00-welcome/01-manage-access.yaml b/content/00-welcome/01-manage-access.yaml index c232a7b..d11743e 100644 --- a/content/00-welcome/01-manage-access.yaml +++ b/content/00-welcome/01-manage-access.yaml @@ -4,7 +4,7 @@ meta: description: ' Restrict Access for the Website' heroimage: null heroimagealt: null - owner: trendschau + owner: Sebastian author: null allowedrole: null alloweduser: null diff --git a/content/00-welcome/02-write-content.yaml b/content/00-welcome/02-write-content.yaml index bf48673..05a410b 100644 --- a/content/00-welcome/02-write-content.yaml +++ b/content/00-welcome/02-write-content.yaml @@ -2,7 +2,7 @@ meta: navtitle: 'write content' title: 'Write Content' description: 'Typemill provides easy and intuitive authoring tools and we work hard to create a good author experience. With the interactive navigation you can create pages' - owner: trendschau + owner: Sebastian modified: '2023-05-11' created: '2023-06-12' time: 22-09-48 diff --git a/content/00-welcome/03-get-help.yaml b/content/00-welcome/03-get-help.yaml index 285fc15..efc891b 100644 --- a/content/00-welcome/03-get-help.yaml +++ b/content/00-welcome/03-get-help.yaml @@ -4,7 +4,7 @@ meta: description: 'If you found a bug or if you have a question, then please open a new issue on GitHub. Do you need professional help, an individual theme or a special plugin?' heroimage: null heroimagealt: null - owner: Sebastian + owner: trendschau author: null allowedrole: null alloweduser: null diff --git a/system/typemill/Controllers/ControllerWebFrontend.php b/system/typemill/Controllers/ControllerWebFrontend.php index bb7db11..77a3d3e 100644 --- a/system/typemill/Controllers/ControllerWebFrontend.php +++ b/system/typemill/Controllers/ControllerWebFrontend.php @@ -108,6 +108,12 @@ class ControllerWebFrontend extends Controller # DISPATCH LIVE NAVIGATION $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 = $navigation->getItemWithKeyPath($liveNavigation, $keyPathArray); + } + # ADD BACKWARD-/FORWARD PAGINATION $item = $navigation->getPagingForItem($liveNavigation, $item); $item = $this->c->get('dispatcher')->dispatch(new OnItemLoaded($item), 'onItemLoaded')->getData(); diff --git a/system/typemill/Models/Navigation.php b/system/typemill/Models/Navigation.php index a002d18..88151cd 100644 --- a/system/typemill/Models/Navigation.php +++ b/system/typemill/Models/Navigation.php @@ -564,7 +564,7 @@ class Navigation extends Folder } public function getPagingForItem($navigation, $item) - { + { # if page is home if(trim($item->pathWithoutType, DIRECTORY_SEPARATOR) == 'index') { diff --git a/system/typemill/Models/Validation.php b/system/typemill/Models/Validation.php index 0175d15..5cd7d94 100644 --- a/system/typemill/Models/Validation.php +++ b/system/typemill/Models/Validation.php @@ -461,7 +461,7 @@ class Validation { $v = new Validator($params); - $v->rule('required', ['item_id', 'parent_id_from', 'parent_id_to']); + $v->rule('required', ['item_id']); $v->rule('regex', 'item_id', '/^[0-9.]+$/i'); $v->rule('regex', 'parent_id_from', '/^[a-zA-Z0-9.]+$/i'); $v->rule('regex', 'parent_id_to', '/^[a-zA-Z0-9.]+$/i');