tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2294 from wilr/fixgridexport

Browse Source 
FIX: Remove limit on GridField export
This commit is contained in:
Ingo Schommer 2013-08-20 14:08:18 -07:00
commit a6da1f5570
4 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
forms/gridfield/GridFieldExportButton.php
View File

@ -128,8 +128,9 @@ class GridFieldExportButton implements GridField_HTMLProvider, GridField_ActionP
} }
} }
foreach($items as $item) { foreach($items->limit(null) as $item) {
$columnData = array(); $columnData = array();
foreach($csvColumns as $columnSource => $columnHeader) { foreach($csvColumns as $columnSource => $columnHeader) {
if(!is_string($columnHeader) && is_callable($columnHeader)) { if(!is_string($columnHeader) && is_callable($columnHeader)) {
if($item->hasMethod($columnSource)) { if($item->hasMethod($columnSource)) {

5
model/ArrayList.php
View File

@ -133,8 +133,13 @@ class ArrayList extends ViewableData implements SS_List, SS_Filterable, SS_Sorta
* @return ArrayList * @return ArrayList
*/ */
public function limit($length, $offset = 0) { public function limit($length, $offset = 0) {
if(!$length) {
$length = count($this->items);
}
$list = clone $this; $list = clone $this;
$list->items = array_slice($this->items, $offset, $length); $list->items = array_slice($this->items, $offset, $length);
return $list; return $list;
} }

9
model/DataList.php
View File

@ -212,22 +212,21 @@ class DataList extends ViewableData implements SS_List, SS_Filterable, SS_Sortab
} }
/** /**
* Return a new DataList instance with the records returned in this query restricted by a limit clause * Return a new DataList instance with the records returned in this query
* restricted by a limit clause.
* *
* @param int $limit * @param int $limit
* @param int $offset * @param int $offset
*/ */
public function limit($limit, $offset = 0) { public function limit($limit, $offset = 0) {
if(!$limit && !$offset) {
return $this;
}
return $this->alterDataQuery(function($query) use ($limit, $offset){ return $this->alterDataQuery(function($query) use ($limit, $offset){
$query->limit($limit, $offset); $query->limit($limit, $offset);
}); });
} }
/** /**
* Return a new DataList instance as a copy of this data list with the sort order set * Return a new DataList instance as a copy of this data list with the sort
* order set.
* *
* @see SS_List::sort() * @see SS_List::sort()
* @see SQLQuery::orderby * @see SQLQuery::orderby

23
tests/model/DataListTest.php
View File

@ -99,6 +99,29 @@ class DataListTest extends SapphireTest {
$this->assertEquals(array('Joe', 'Phil'), $list->limit(2, 1)->column('Name')); $this->assertEquals(array('Joe', 'Phil'), $list->limit(2, 1)->column('Name'));
} }
public function testLimitAndOffset() {
$list = DataObjectTest_TeamComment::get();
$check = $list->limit(3);
$this->assertEquals(3, $check->count());
$check = $list->limit(1);
$this->assertEquals(1, $check->count());
$check = $list->limit(1, 1);
$this->assertEquals(1, $check->count());
$check = $list->limit(false);
$this->assertEquals(3, $check->count());
$check = $list->limit(null);
$this->assertEquals(3, $check->count());
// no limit with an offset is currently not supported by the orm
// $check = $list->limit(null, 2);
// $this->assertEquals(1, $check->count());
}
public function testDataClass() { public function testDataClass() {
$list = DataObjectTest_TeamComment::get(); $list = DataObjectTest_TeamComment::get();
$this->assertEquals('DataObjectTest_TeamComment',$list->dataClass()); $this->assertEquals('DataObjectTest_TeamComment',$list->dataClass());