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

MINOR Fixing additional cases where DataList needs to be returned correctly when filtering

Browse Source
This commit is contained in:
Sean Harvey 2012-06-15 16:08:54 +12:00
parent d014b4d106
commit b04c199064
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
forms/gridfield/GridFieldAddExistingAutocompleter.php
View File

@ -179,7 +179,7 @@ class GridFieldAddExistingAutocompleter implements GridField_HTMLProvider, GridF
$stmts[] .= sprintf('"%s" LIKE \'%s%%\'', $searchField, $request->param('ID')); $stmts[] .= sprintf('"%s" LIKE \'%s%%\'', $searchField, $request->param('ID'));
} }
$results = $allList->where(implode(' OR ', $stmts))->subtract($gridField->getList()); $results = $allList->where(implode(' OR ', $stmts))->subtract($gridField->getList());
$results->sort($searchFields[0], 'ASC'); $results = $results->sort($searchFields[0], 'ASC');
$json = array(); $json = array();
foreach($results as $result) { foreach($results as $result) {

2
tests/forms/gridfield/GridFieldExportButtonTest.php
View File

@ -17,7 +17,7 @@ class GridFieldExportButtonTest extends SapphireTest {
parent::setUp(); parent::setUp();
$this->list = new DataList('GridFieldExportButtonTest_Team'); $this->list = new DataList('GridFieldExportButtonTest_Team');
$this->list->sort('Name'); $this->list = $this->list->sort('Name');
$config = GridFieldConfig::create()->addComponent(new GridFieldExportButton()); $config = GridFieldConfig::create()->addComponent(new GridFieldExportButton());
$this->gridField = new GridField('testfield', 'testfield', $this->list, $config); $this->gridField = new GridField('testfield', 'testfield', $this->list, $config);
} }

9
tests/model/MapTest.php
View File

@ -58,8 +58,7 @@ class SS_MapTest extends SapphireTest {
} }
function testKeys() { function testKeys() {
$list = DataObjectTest_TeamComment::get(); $list = DataObjectTest_TeamComment::get()->sort('Name');
$list->sort('Name');
$map = new SS_Map($list, 'Name', 'Comment'); $map = new SS_Map($list, 'Name', 'Comment');
$this->assertEquals(array( $this->assertEquals(array(
'Bob', 'Bob',
@ -69,8 +68,7 @@ class SS_MapTest extends SapphireTest {
} }
function testMethodAsValueField() { function testMethodAsValueField() {
$list = DataObjectTest_Team::get(); $list = DataObjectTest_Team::get()->sort('Title');
$list->sort('Title');
$map = new SS_Map($list, 'ID', 'MyTitle'); $map = new SS_Map($list, 'ID', 'MyTitle');
$this->assertEquals(array( $this->assertEquals(array(
'Team Subteam 1', 'Team Subteam 1',
@ -83,8 +81,7 @@ class SS_MapTest extends SapphireTest {
} }
function testValues() { function testValues() {
$list = DataObjectTest_TeamComment::get(); $list = DataObjectTest_TeamComment::get()->sort('Name');
$list->sort('Name');
$map = new SS_Map($list, 'Name', 'Comment'); $map = new SS_Map($list, 'Name', 'Comment');
$this->assertEquals(array( $this->assertEquals(array(
'This is a team comment by Bob', 'This is a team comment by Bob',