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

Fix issue processwire/processwire-issues#289

Browse Source
This commit is contained in:
Ryan Cramer
2017-06-21 10:12:09 -04:00
parent b32a2f0058
commit 68a4ddee88
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
wire/core/PageFinder.php
View File

@@ -823,7 +823,7 @@ class PageFinder extends Wire {
} }
} }
if(!$hasParent && $field->parent_id) { if(!$hasParent && $field->parent_id) {
if(strpos($field->type->className(), 'FieldtypeRepeater') !== false) { if($this->isRepeaterFieldtype($field->type)) {
// repeater items not stored directly under parent_id, but as another parent under parent_id. // repeater items not stored directly under parent_id, but as another parent under parent_id.
// so we use has_parent instead here // so we use has_parent instead here
$selectors->prepend(new SelectorEqual('has_parent', $field->parent_id)); $selectors->prepend(new SelectorEqual('has_parent', $field->parent_id));
@@ -1078,7 +1078,7 @@ class PageFinder extends Wire {
if(count($fields) > 1 if(count($fields) > 1
|| (count($valueArray) > 1 && $numEmptyValues > 0) || (count($valueArray) > 1 && $numEmptyValues > 0)
|| $subfield == 'count' || ($subfield == 'count' && !$this->isRepeaterFieldtype($field->type))
|| ($selector->not && $selector->operator != '!=') || ($selector->not && $selector->operator != '!=')
|| $selector->operator == '!=') { || $selector->operator == '!=') {
// join should instead be a leftjoin // join should instead be a leftjoin
@@ -1574,8 +1574,13 @@ class PageFinder extends Wire {
$query->leftjoin("$table AS $tableAlias ON $tableAlias.pages_id=pages.$idColumn"); $query->leftjoin("$table AS $tableAlias ON $tableAlias.pages_id=pages.$idColumn");
if($subValue === 'count') { if($subValue === 'count') {
// sort by quantity of items if($this->isRepeaterFieldtype($field->type)) {
$value = "COUNT($tableAlias.data)"; // repeaters have a native count column that can be used for sorting
$value = "$tableAlias.count";
} else {
// sort by quantity of items
$value = "COUNT($tableAlias.data)";
}
} else if(is_object($blankValue) && ($blankValue instanceof PageArray || $blankValue instanceof Page)) { } else if(is_object($blankValue) && ($blankValue instanceof PageArray || $blankValue instanceof Page)) {
// If it's a FieldtypePage, then data isn't worth sorting on because it just contains an ID to the page // If it's a FieldtypePage, then data isn't worth sorting on because it just contains an ID to the page
@@ -2187,12 +2192,11 @@ class PageFinder extends Wire {
} }
if($field) { if($field) {
$className = $field->type->className();
if($field->type instanceof FieldtypePage) { if($field->type instanceof FieldtypePage) {
$is = true; $is = true;
} else if(strpos($field->type->className(), 'FieldtypePageTable') !== false) { } else if(strpos($field->type->className(), 'FieldtypePageTable') !== false) {
$is = true; $is = true;
} else if(strpos($className, 'FieldtypeRepeater') !== false) { } else if($this->isRepeaterFieldtype($field->type)) {
$is = $literal ? false : true; $is = $literal ? false : true;
} else { } else {
$test = $field->type->getBlankValue(new NullPage(), $field); $test = $field->type->getBlankValue(new NullPage(), $field);
@@ -2204,5 +2208,16 @@ class PageFinder extends Wire {
if($is && $field) $is = $field; if($is && $field) $is = $field;
return $is; return $is;
} }
/**
* Is the given Fieldtype for a repeater?
*
* @param Fieldtype $fieldtype
* @return bool
*
*/
protected function isRepeaterFieldtype(Fieldtype $fieldtype) {
return strpos($fieldtype->className(), 'FieldtypeRepeater') !== false;
}
} }