Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-05-06 18:26:06 +02:00
Code Issues Packages Projects Releases Activity

Flex Pages: Implemented recursive filterBy()

Browse Source
This commit is contained in:
Matias Griese
2019-11-07 13:14:51 +02:00
parent 427c39e88e
commit b56ede81f0
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
system/src/Grav/Common/Page/Flex/PageIndex.php
View File

@@ -267,7 +267,7 @@ class PageIndex extends FlexPageIndex
foreach ($children as $child) {
$selected = $child->path() === $extra;
$includeChildren = \is_array($leaf) && !empty($leaf) && $selected;
if (!$selected && !$child->filterBy($filters)) {
if (!$selected && !$child->filterBy($filters, true)) {
continue;
}
if ($field) {

26
system/src/Grav/Common/Page/Flex/PageObject.php
View File

@@ -256,9 +256,10 @@ class PageObject extends FlexPageObject
* - translated: bool
*
* @param array $filters
* @param bool $recursive
* @return bool
*/
public function filterBy(array $filters): bool
public function filterBy(array $filters, bool $recursive = false): bool
{
foreach ($filters as $key => $value) {
if ($value === null || $value === '') {
@@ -268,22 +269,23 @@ class PageObject extends FlexPageObject
case 'search':
$matches = $this->search((string)$value);
break;
case 'page_type': // filename
$matches = true;
case 'page_type':
$types = $value ? explode(',', $value) : [];
$matches = in_array($this->template(), $types, true);
break;
case 'extension': // .en.md
case 'extension':
$matches = Utils::contains((string)$value, $this->extension());
break;
case 'modular': // _name (filename)
case 'visible': // order
case 'modular':
case 'visible':
case 'routable':
case 'published':
$matches = $this->{$key}() === (bool)$value;
break;
case 'page': // markdown in index
case 'page':
$matches = $this->isPage() === (bool)$value;
break;
case 'translated': // markdown in index
case 'translated':
$matches = $this->hasTranslation() === (bool)$value;
break;
default:
@@ -291,6 +293,14 @@ class PageObject extends FlexPageObject
break;
}
if ($matches === false) {
if ($recursive) {
foreach ($this->children() as $child) {
if ($child->filterBy($filters, true)) {
return true;
}
}
}
return false;
}
}