mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-08 07:47:00 +02:00
Code Issues Releases Wiki Activity

Fix issue processwire/processwire-issues#1879

Browse Source
This commit is contained in:
Ryan Cramer
2024-02-20 09:03:47 -05:00
parent 71a1e9c9d9
commit 3e90cb74fa
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
wire/modules/Process/ProcessPageList/ProcessPageListRenderJSON.php
View File

@@ -5,7 +5,7 @@ require_once(dirname(__FILE__) . '/ProcessPageListRender.php');
/** /**
* JSON implementation of the Page List rendering * JSON implementation of the Page List rendering
* *
* ProcessWire 3.x, Copyright 2023 by Ryan Cramer * ProcessWire 3.x, Copyright 2024 by Ryan Cramer
* https://processwire.com * https://processwire.com
* *
*/ */
@@ -167,7 +167,7 @@ class ProcessPageListRenderJSON extends ProcessPageListRender {
if($state === 'advanced' && $config->advanced) $states[$state] = $state; if($state === 'advanced' && $config->advanced) $states[$state] = $state;
if($state === 'superuser' && $this->superuser) $states[$state] = $state; if($state === 'superuser' && $this->superuser) $states[$state] = $state;
} }
if($states == $this->hidePagesNot) $showHidden = true; if(count($states) && $states == $this->hidePagesNot) $showHidden = true;
} }
foreach($this->children as $page) { foreach($this->children as $page) {
@@ -175,22 +175,23 @@ class ProcessPageListRenderJSON extends ProcessPageListRender {
if(!$this->superuser && !$page->listable()) continue; if(!$this->superuser && !$page->listable()) continue;
$id = $page->id; $id = $page->id;
if(isset($this->hidePages[$id]) && $id !== $idTrash && $id !== 1) {
// page hidden in page tree
if(!$showHidden) continue;
}
if($id == $id404 && !$this->superuser) { if($id == $id404 && !$this->superuser) {
// allow showing 404 page, only if it's editable // allow showing 404 page, only if it's editable
if(!$page->editable()) continue; if($page->editable()) $extraPages[$id] = $page;
continue;
} else if(isset($this->hidePages[$id]) && $id !== $idTrash && $id !== 1) {
// page hidden in page tree
if(!$showHidden) continue;
} else if(isset($this->systemIDs[$id])) { } else if(isset($this->systemIDs[$id])) {
// system page
if($this->superuser) $extraPages[$id] = $page; if($this->superuser) $extraPages[$id] = $page;
continue; continue;
} }
$child = $this->renderChild($page); $children[] = $this->renderChild($page);
$children[] = $child;
} }
// add in the trash page if not present and allowed // add in the trash page if not present and allowed