php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-18 07:20:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #909 from bixuehujin/dataprovider

Browse Source 
Fixed pagination not working before data loaded
This commit is contained in:
Qiang Xue
2013-09-26 08:40:24 -07:00
parent 220db270cf b7948e4840
commit 647aa71a5a
4 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/yii/data/ActiveDataProvider.php
View File

@@ -156,7 +156,6 @@ class ActiveDataProvider extends DataProvider
throw new InvalidConfigException('The "query" property must be an instance of Query or its subclass.'); throw new InvalidConfigException('The "query" property must be an instance of Query or its subclass.');
} }
if (($pagination = $this->getPagination()) !== false) { if (($pagination = $this->getPagination()) !== false) {
$pagination->totalCount = $this->getTotalCount();
$this->query->limit($pagination->getLimit())->offset($pagination->getOffset()); $this->query->limit($pagination->getLimit())->offset($pagination->getOffset());
} }
if (($sort = $this->getSort()) !== false) { if (($sort = $this->getSort()) !== false) {

1
framework/yii/data/ArrayDataProvider.php
View File

@@ -114,7 +114,6 @@ class ArrayDataProvider extends DataProvider
} }
if (($pagination = $this->getPagination()) !== false) { if (($pagination = $this->getPagination()) !== false) {
$pagination->totalCount = $this->getTotalCount();
$models = array_slice($models, $pagination->getOffset(), $pagination->getLimit()); $models = array_slice($models, $pagination->getOffset(), $pagination->getLimit());
} }

1
framework/yii/data/DataProvider.php
View File

@@ -48,6 +48,7 @@ abstract class DataProvider extends Component implements DataProviderInterface
if ($this->id !== null) { if ($this->id !== null) {
$this->_pagination->pageVar = $this->id . '-page'; $this->_pagination->pageVar = $this->id . '-page';
} }
$this->_pagination->totalCount = $this->getTotalCount();
} }
return $this->_pagination; return $this->_pagination;
} }

17
tests/unit/framework/data/ActiveDataProviderTest.php
View File

@@ -85,4 +85,21 @@ class ActiveDataProviderTest extends DatabaseTestCase
$provider->refresh(); $provider->refresh();
$this->assertEquals(2, count($provider->getModels())); $this->assertEquals(2, count($provider->getModels()));
} }
public function testPaginationBeforeModels()
{
$query = new Query;
$provider = new ActiveDataProvider(array(
'db' => $this->getConnection(),
'query' => $query->from('tbl_order')->orderBy('id'),
));
$pagination = $provider->getPagination();
$this->assertEquals(1, $pagination->getPageCount());
$this->assertCount(3, $provider->getModels());
$provider->getPagination()->pageSize = 2;
$this->assertEquals(3, count($provider->getModels()));
$provider->refresh();
$this->assertEquals(2, count($provider->getModels()));
}
} }