tonyair
/
silverstripe-gridfieldextensions
mirror of https://github.com/symbiote/silverstripe-gridfieldextensions.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bug where LastEdited is assumed to be on the same table as the sort column

This commit is contained in:
Daniel Hensby 2016-07-26 14:12:20 +01:00
parent e62422fdb3
commit ff1cdc934e
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
2 changed files with 74 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
tests/GridFieldOrderableRowsTest.php
View File

@ -12,6 +12,8 @@ class GridFieldOrderableRowsTest extends SapphireTest {
'GridFieldOrderableRowsTest_Parent',
'GridFieldOrderableRowsTest_Ordered',
'GridFieldOrderableRowsTest_Subclass',
'GridFieldOrderableRowsTest_Unorderable',
'GridFieldOrderableRowsTest_OrderableChild',
);
public function testReorderItems() {
@ -49,6 +51,35 @@ class GridFieldOrderableRowsTest extends SapphireTest {
}
public function testSortableChildClass() {
$orderable = new GridFieldOrderableRows('Sort');
$reflection = new ReflectionMethod($orderable, 'executeReorder');
$reflection->setAccessible(true);
$parent = $this->objFromFixture('GridFieldOrderableRowsTest_Ordered', 'nestedtest');
$config = new GridFieldConfig_RelationEditor();
$config->addComponent($orderable);
$grid = new GridField(
'Children',
'Children',
$parent->Children(),
$config
);
$originalOrder = $parent->Children()->column('ID');
$desiredOrder = array_reverse($originalOrder);
$this->assertNotEquals($originalOrder, $desiredOrder);
$reflection->invoke($orderable, $grid, $desiredOrder);
$newOrder = $parent->Children()->column('ID');
$this->assertEquals($desiredOrder, $newOrder);
}
/**
* @covers GridFieldOrderableRows::getSortTable
*/
@ -112,6 +143,10 @@ class GridFieldOrderableRowsTest_Ordered extends DataObject implements TestOnly
'Parent' => 'GridFieldOrderableRowsTest_Parent'
);
private static $has_many = array(
'Children' => 'GridFieldOrderableRowsTest_OrderableChild',
);
private static $belongs_many_many =array(
'MyManyMany' => 'GridFieldOrderableRowsTest_Parent',
);
@ -121,4 +156,21 @@ class GridFieldOrderableRowsTest_Ordered extends DataObject implements TestOnly
class GridFieldOrderableRowsTest_Subclass extends GridFieldOrderableRowsTest_Ordered implements TestOnly {
}
class GridFieldOrderableRowsTest_Unorderable extends DataObject implements TestOnly {
}
class GridFieldOrderableRowsTest_OrderableChild extends GridFieldOrderableRowsTest_Unorderable implements TestOnly {
private static $db = array(
'Sort' => 'Int',
);
private static $has_one = array(
'Parent' => 'GridFieldOrderableRowsTest_Ordered',
);
private static $default_sort = 'Sort ASC';
}
/**#@-*/

22
tests/GridFieldOrderableRowsTest.yml
View File

@ -1,10 +1,16 @@
GridFieldOrderableRowsTest_Ordered:
item1:
Sort: 1
item2:
Sort: 2
item3:
Sort: 3
item4:
Sort: 4
item5:
Sort: 5
item6:
Sort: 6
GridFieldOrderableRowsTest_Parent:
parent:
MyManyMany:
@ -20,3 +26,19 @@ GridFieldOrderableRowsTest_Parent:
ManyManySort: 108
- 5: =>GridFieldOrderableRowsTest_Ordered.item6
ManyManySort: 108
GridFieldOrderableRowsTest_OrderableChild:
item1:
Sort: 1
item2:
Sort: 2
item3:
Sort: 3
item4:
Sort: 4
GridFieldOrderableRowsTest_Ordered:
nestedtest:
Children: >
=>GridFieldOrderableRowsTest_OrderableChild.item1,
=>GridFieldOrderableRowsTest_OrderableChild.item2,
=>GridFieldOrderableRowsTest_OrderableChild.item3,
=>GridFieldOrderableRowsTest_OrderableChild.item4