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

BUGFIX: Fixed bug with unpaginated TableListFields. Added tests for TableListField pagination

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60573 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2008-08-13 01:39:46 +00:00
parent 26051153b8
commit cb86fdb3d1
3 changed files with 71 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
forms/TableListField.php
View File

@ -361,7 +361,7 @@ JS
} }
function sourceItems() { function sourceItems() {
$SQL_limit = ($this->showPagination && $this->pageSize) ? "{$this->pageSize}" : "0"; $SQL_limit = ($this->showPagination && $this->pageSize) ? "{$this->pageSize}" : null;
if(isset($_REQUEST['ctf'][$this->Name()]['start']) && is_numeric($_REQUEST['ctf'][$this->Name()]['start'])) { if(isset($_REQUEST['ctf'][$this->Name()]['start']) && is_numeric($_REQUEST['ctf'][$this->Name()]['start'])) {
$SQL_start = (isset($_REQUEST['ctf'][$this->Name()]['start'])) ? intval($_REQUEST['ctf'][$this->Name()]['start']) : "0"; $SQL_start = (isset($_REQUEST['ctf'][$this->Name()]['start'])) ? intval($_REQUEST['ctf'][$this->Name()]['start']) : "0";
} else { } else {

58
tests/forms/TableListFieldTest.php
View File

@ -3,7 +3,7 @@
class TableListFieldTest extends SapphireTest { class TableListFieldTest extends SapphireTest {
static $fixture_file = 'sapphire/tests/forms/TableListFieldTest.yml'; static $fixture_file = 'sapphire/tests/forms/TableListFieldTest.yml';
function testCanReferenceCustomMethodsAndFiledsOnObject() { function testCanReferenceCustomMethodsAndFieldsOnObject() {
$table = new TableListField("Tester", "TableListFieldTest_Obj", array( $table = new TableListField("Tester", "TableListFieldTest_Obj", array(
"A" => "Col A", "A" => "Col A",
"B" => "Col B", "B" => "Col B",
@ -11,7 +11,6 @@ class TableListFieldTest extends SapphireTest {
"D" => "Col D", "D" => "Col D",
"E" => "Col E", "E" => "Col E",
)); ));
$result = $table->FieldHolder(); $result = $table->FieldHolder();
// Do a quick check to ensure that some of the D() and getE() values got through // Do a quick check to ensure that some of the D() and getE() values got through
@ -19,6 +18,61 @@ class TableListFieldTest extends SapphireTest {
$this->assertRegExp('/>\s*a2\/b2\/c2\s*</', $result); $this->assertRegExp('/>\s*a2\/b2\/c2\s*</', $result);
$this->assertRegExp('/>\s*a2-e</', $result); $this->assertRegExp('/>\s*a2-e</', $result);
} }
function testUnpaginatedSourceItemGeneration() {
/* In this simple case, the source items should just list all the data objects specified */
$table = new TableListField("Tester", "TableListFieldTest_Obj", array(
"A" => "Col A",
"B" => "Col B",
"C" => "Col C",
"D" => "Col D",
"E" => "Col E",
));
$items = $table->sourceItems();
$this->assertNotNull($items);
$itemMap = $items->toDropdownMap("ID", "A") ;
$this->assertEquals(array(1 => "a1", 2 => "a2", 3 => "a3", 4 => "a4", 5 => "a5"), $itemMap);
}
function testFirstPageOfPaginatedSourceItemGeneration() {
/* With pagination enabled, only the first page of items should be shown */
$table = new TableListField("Tester", "TableListFieldTest_Obj", array(
"A" => "Col A",
"B" => "Col B",
"C" => "Col C",
"D" => "Col D",
"E" => "Col E",
));
$table->ShowPagination = true;
$table->PageSize = 2;
$items = $table->sourceItems();
$this->assertNotNull($items);
$itemMap = $items->toDropdownMap("ID", "A") ;
$this->assertEquals(array(1 => "a1", 2 => "a2"), $itemMap);
}
function testSecondPageOfPaginatedSourceItemGeneration() {
/* With pagination enabled, only the first page of items should be shown */
$table = new TableListField("Tester", "TableListFieldTest_Obj", array(
"A" => "Col A",
"B" => "Col B",
"C" => "Col C",
"D" => "Col D",
"E" => "Col E",
));
$table->ShowPagination = true;
$table->PageSize = 2;
$_REQUEST['ctf']['Tester']['start'] = 2;
$items = $table->sourceItems();
$this->assertNotNull($items);
$itemMap = $items->toDropdownMap("ID", "A") ;
$this->assertEquals(array(3 => "a3", 4 => "a4"), $itemMap);
}
} }
class TableListFieldTest_Obj extends DataObject implements TestOnly { class TableListFieldTest_Obj extends DataObject implements TestOnly {

12
tests/forms/TableListFieldTest.yml
View File

@ -7,4 +7,16 @@ TableListFieldTest_Obj:
A: a2 A: a2
B: b2 B: b2
C: c2 C: c2
three:
A: a3
B: b3
C: c3
four:
A: a4
B: b4
C: c4
five:
A: a5
B: b5
C: c5