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

Fix issue processwire/processwire-issues#1159

Browse Source
This commit is contained in:
Ryan Cramer
2020-04-27 15:35:57 -04:00
parent 1cd1976a38
commit ca8e779402
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
wire/modules/Fieldtype/FieldtypePage.module
View File

@@ -378,15 +378,28 @@ class FieldtypePage extends FieldtypeMulti implements Module, ConfigurableModule
* *
*/ */
public function ___formatValue(Page $page, Field $field, $value) { public function ___formatValue(Page $page, Field $field, $value) {
if($field->get('allowUnpub')) return $value;
// remove unpublished pages for front-end formatted output // remove unpublished pages for front-end formatted output
if($value instanceof Page) { if($value instanceof Page) {
if($value->hasStatus(Page::statusUnpublished)) $value = $this->getBlankValue($page, $field); if($value->hasStatus(Page::statusUnpublished)) {
$value = $this->getBlankValue($page, $field);
} else if($value instanceof PageArray) { }
} else if($value instanceof PageArray && $field->get('allowUnpub')) {
// unpublished pages are allowed, so if any are present, create new
// formatted value that excludes the unpublished pages
$hasUnpublished = false;
foreach($value as $item) { foreach($value as $item) {
if($item->hasStatus(Page::statusUnpublished)) $value->remove($item); $hasUnpublished = $item->hasStatus(Page::statusUnpublished);
if($hasUnpublished) break;
}
if($hasUnpublished) {
$items = $this->getBlankValue($page, $field);
$items->setTrackChanges(false);
foreach($value as $item) {
if(!$item->hasStatus(Page::statusUnpublished)) $items->add($item);
}
$items->resetTrackChanges(true);
$value = $items;
} }
} }