Skip to content
Merged
Changes from all commits
Commits
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
15 changes: 11 additions & 4 deletions src/actions/ViewRelationshipAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,20 @@ private function resolveHasOne(ActiveQueryInterface $relation):Item
*/
private function resolveHasMany(ActiveQueryInterface $relation)
{
$dataProvider = Yii::createObject($this->dataProvider);
/**
* For the dataProvider to create a TotalCount for pagination, query must be passed first.
* @see \yii\data\ActiveDataProvider::prepareTotalCount
*/
$dataProvider = Yii::createObject(array_merge(
['query' => $relation],
$this->dataProvider,
['resourceKey' => $this->resourceKey],
['transformer' => $this->transformer],
));
if (!$dataProvider instanceof JsonApiActiveDataProvider && !$dataProvider instanceof CursorActiveDataProvider) {
throw new InvalidConfigException('Invalid dataProvider configuration');
}
$dataProvider->query = $relation;
$dataProvider->resourceKey = $this->resourceKey;
$dataProvider->transformer = $this->transformer;

$dataProvider->setSort(['params' => Yii::$app->getRequest()->getQueryParams()]);

if ($this->prepareDataProvider !== null) {
Expand Down
Loading