move limit to before extension point. moved it into an if statement
This commit is contained in:
parent
9e0e9a4fed
commit
3c0ded63b9
|
@ -16,6 +16,7 @@ use SilverStripe\ORM\Queries\SQLSelect;
|
||||||
use SilverStripe\Versioned\Versioned;
|
use SilverStripe\Versioned\Versioned;
|
||||||
use SilverStripe\View\ArrayData;
|
use SilverStripe\View\ArrayData;
|
||||||
use SilverStripe\Widgets\Model\Widget;
|
use SilverStripe\Widgets\Model\Widget;
|
||||||
|
use SilverStripe\Core\Convert;
|
||||||
|
|
||||||
if (!class_exists(Widget::class)) {
|
if (!class_exists(Widget::class)) {
|
||||||
return;
|
return;
|
||||||
|
@ -124,7 +125,11 @@ class BlogArchiveWidget extends Widget
|
||||||
$query = SQLSelect::create($fields, '"BlogPost' . $suffix . '"')
|
$query = SQLSelect::create($fields, '"BlogPost' . $suffix . '"')
|
||||||
->addGroupBy($publishDate)
|
->addGroupBy($publishDate)
|
||||||
->addOrderBy('"PublishDate" DESC')
|
->addOrderBy('"PublishDate" DESC')
|
||||||
->addWhere(['"PublishDate" <= ?' => DBDatetime::now()->Format(DBDatetime::ISO_DATETIME)]);
|
->addLeftJoin('SiteTree' . $suffix, '"SiteTree' . $suffix . '"."ID" = "BlogPost' . $suffix . '"."ID"')
|
||||||
|
->addWhere([
|
||||||
|
'"PublishDate" <= ?' => DBDatetime::now()->Format(DBDatetime::ISO_DATETIME),
|
||||||
|
'"SiteTree' . $suffix . '"."ParentID"' => $this->BlogID,
|
||||||
|
]);
|
||||||
|
|
||||||
$posts = $query->execute();
|
$posts = $query->execute();
|
||||||
$result = ArrayList::create();
|
$result = ArrayList::create();
|
||||||
|
@ -148,8 +153,12 @@ class BlogArchiveWidget extends Widget
|
||||||
]));
|
]));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($this->NumberToDisplay) {
|
||||||
|
$result = $result->limit($this->NumberToDisplay);
|
||||||
|
}
|
||||||
|
|
||||||
$this->extend('updateGetArchive', $result);
|
$this->extend('updateGetArchive', $result);
|
||||||
|
|
||||||
return $result->limit($this->NumberToDisplay);
|
return $result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue