tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-02 01:19:29 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.1'

Browse Source
This commit is contained in:
Simon Welsh 2013-07-05 11:56:31 +12:00
commit 4b57a343a2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
search/filters/SearchFilter.php
View File

@ -183,7 +183,8 @@ abstract class SearchFilter extends Object {
if($candidateClass == 'DataObject') {
// fallback to the provided name in the event of a joined column
// name (as the candidate class doesn't check joined records)
return $this->fullName;
$parts = explode('.', $this->fullName);
return '"' . implode('"."', $parts) . '"';
}
return "\"$candidateClass\".\"$this->name\"";

3
tests/model/DataListTest.php
View File

@ -625,7 +625,8 @@ class DataListTest extends SapphireTest {
));
$this->assertEquals(2, $list->count());
$this->assertEquals(array('Joe', 'Bob'), $list->column('Name'));
$values = $list->column('Name');
$this->assertEquals(array_intersect($values, array('Joe', 'Bob')), $values);
}
public function testFilterAndExcludeById() {