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

Merge pull request #7701 from open-sausages/pulls/4.0/better-summary-merging

Browse Source 
BUG Fix incorrect merge of associative / non-associative summary fields
This commit is contained in:
Daniel Hensby 2017-12-14 13:25:51 +00:00 committed by GitHub
commit 7733e9caed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 115 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ORM/DataObject.php
View File

@ -3337,12 +3337,15 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
*/
public function summaryFields()
{
$fields = $this->config()->get('summary_fields');
$rawFields = $this->config()->get('summary_fields');
// if fields were passed in numeric array,
// convert to an associative array
if ($fields && array_key_exists(0, $fields)) {
$fields = array_combine(array_values($fields), array_values($fields));
// Merge associative / numeric keys
$fields = [];
foreach ($rawFields as $key => $value) {
if (is_int($key)) {
$key = $value;
}
$fields[$key] = $value;
}
if (!$fields) {

26
tests/php/ORM/DataObjectTest.php
View File

@ -2,25 +2,23 @@
namespace SilverStripe\ORM\Tests;
use InvalidArgumentException;
use SilverStripe\Core\Config\Config;
use SilverStripe\Dev\SapphireTest;
use SilverStripe\i18n\i18n;
use SilverStripe\ORM\Connect\MySQLDatabase;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\DataObjectSchema;
use SilverStripe\ORM\DB;
use SilverStripe\ORM\FieldType\DBBoolean;
use SilverStripe\ORM\FieldType\DBDatetime;
use SilverStripe\ORM\FieldType\DBField;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\DB;
use SilverStripe\ORM\Connect\MySQLDatabase;
use SilverStripe\ORM\FieldType\DBPolymorphicForeignKey;
use SilverStripe\ORM\FieldType\DBVarchar;
use SilverStripe\ORM\ManyManyList;
use SilverStripe\ORM\Tests\DataObjectTest\Player;
use SilverStripe\ORM\ValidationException;
use SilverStripe\View\ViewableData;
use stdClass;
use ReflectionException;
use InvalidArgumentException;
class DataObjectTest extends SapphireTest
{
@ -1190,15 +1188,13 @@ class DataObjectTest extends SapphireTest
$summaryFields = $team->summaryFields();
$this->assertEquals(
'Custom Title',
$summaryFields['Title'],
'Custom title is preserved'
);
$this->assertEquals(
'Captain\'s shirt number',
$summaryFields['Captain.ShirtNumber'],
'Custom title on relation is preserved'
[
'Title' => 'Custom Title',
'Title.UpperCase' => 'Title',
'Captain.ShirtNumber' => 'Captain\'s shirt number',
'Captain.FavouriteTeam.Title' => 'Captain\'s favourite team',
],
$summaryFields
);
}

2
tests/php/ORM/DataObjectTest/Team.php
View File

@ -59,7 +59,7 @@ class Team extends DataObject implements TestOnly
);
private static $summary_fields = array(
'Title' => 'Custom Title',
'Title', // Overridden by Team_Extension
'Title.UpperCase' => 'Title',
'Captain.ShirtNumber' => 'Captain\'s shirt number',
'Captain.FavouriteTeam.Title' => 'Captain\'s favourite team'

4
tests/php/ORM/DataObjectTest/Team_Extension.php
View File

@ -7,6 +7,10 @@ use SilverStripe\ORM\DataExtension;
class Team_Extension extends DataExtension implements TestOnly
{
private static $summary_fields = [
'Title' => 'Custom Title', // override non-associative 'Title'
];
private static $db = array(
'ExtendedDatabaseField' => 'Varchar'
);