mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-03 06:38:51 +02:00
Merge remote-tracking branch 'origin/3.1'
This commit is contained in:
commit
4b57a343a2
@ -183,7 +183,8 @@ abstract class SearchFilter extends Object {
|
|||||||
if($candidateClass == 'DataObject') {
|
if($candidateClass == 'DataObject') {
|
||||||
// fallback to the provided name in the event of a joined column
|
// fallback to the provided name in the event of a joined column
|
||||||
// name (as the candidate class doesn't check joined records)
|
// name (as the candidate class doesn't check joined records)
|
||||||
return $this->fullName;
|
$parts = explode('.', $this->fullName);
|
||||||
|
return '"' . implode('"."', $parts) . '"';
|
||||||
}
|
}
|
||||||
|
|
||||||
return "\"$candidateClass\".\"$this->name\"";
|
return "\"$candidateClass\".\"$this->name\"";
|
||||||
|
@ -625,7 +625,8 @@ class DataListTest extends SapphireTest {
|
|||||||
));
|
));
|
||||||
|
|
||||||
$this->assertEquals(2, $list->count());
|
$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() {
|
public function testFilterAndExcludeById() {
|
||||||
|
Loading…
Reference in New Issue
Block a user