File tree Expand file tree Collapse file tree 1 file changed +11
-4
lines changed Expand file tree Collapse file tree 1 file changed +11
-4
lines changed Original file line number Diff line number Diff line change @@ -110,13 +110,20 @@ private function resolveHasOne(ActiveQueryInterface $relation):Item
110110 */
111111 private function resolveHasMany (ActiveQueryInterface $ relation )
112112 {
113- $ dataProvider = Yii::createObject ($ this ->dataProvider );
113+ /**
114+ * For the dataProvider to create a TotalCount for pagination, query must be passed first.
115+ * @see \yii\data\ActiveDataProvider::prepareTotalCount
116+ */
117+ $ dataProvider = Yii::createObject (array_merge (
118+ ['query ' => $ relation ],
119+ $ this ->dataProvider ,
120+ ['resourceKey ' => $ this ->resourceKey ],
121+ ['transformer ' => $ this ->transformer ],
122+ ));
114123 if (!$ dataProvider instanceof JsonApiActiveDataProvider && !$ dataProvider instanceof CursorActiveDataProvider) {
115124 throw new InvalidConfigException ('Invalid dataProvider configuration ' );
116125 }
117- $ dataProvider ->query = $ relation ;
118- $ dataProvider ->resourceKey = $ this ->resourceKey ;
119- $ dataProvider ->transformer = $ this ->transformer ;
126+
120127 $ dataProvider ->setSort (['params ' => Yii::$ app ->getRequest ()->getQueryParams ()]);
121128
122129 if ($ this ->prepareDataProvider !== null ) {
You can’t perform that action at this time.
0 commit comments