Skip to content

Search in children subpage of modular #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
masetto wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Search in children subpage of modular #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions simplesearch.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,12 +171,10 @@ public function onPagesInitialized()
continue;
}

if ($cpage->modular()) {
$this->collection->remove($cpage);
$parent = $cpage->parent();
$parent = $this->getModularParent($cpage, $cpage);
if ($parent)
$extras[$parent->path()] = ['slug' => $parent->slug()];
}


}
}
}
Expand Down Expand Up @@ -212,7 +210,25 @@ public function onPagesInitialized()
}
}


/**
* Test if there is modular in page parents and get modular page
*
* @param Page $cpage Page object to perform test if it is modular
* @param Page $leafPage Original page
*
* @return Page Modular page parent or null
*/
protected function getModularParent($cpage, $leafPage) {
$parent = null;
if ($cpage->modular()) {
$this->collection->remove($leafPage);
$parent = $cpage->parent();
} elseif ($cpage->parent()) {
$parent = $this->getModularParent($cpage->parent(), $cpage);
}
return $parent;
}

/**
* Set needed variables to display the search results.
*/
Expand Down