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 branch '4.3' into 4.4

Browse Source
This commit is contained in:
Maxime Rainville 2019-09-04 09:42:09 +12:00
commit 24015c7767
4 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Dev/CsvBulkLoader.php
View File

@ -76,6 +76,7 @@ class CsvBulkLoader extends BulkLoader
$filepath = Director::getAbsFile($filepath);
$csvReader = Reader::createFromPath($filepath, 'r');
$csvReader->setDelimiter($this->delimiter);
$csvReader->stripBom(true);
$tabExtractor = function ($row, $rowOffset, $iterator) {
foreach ($row as &$item) {

21
src/Security/Group.php
View File

@ -83,15 +83,6 @@ class Group extends DataObject
private static $table_name = "Group";
public function populateDefaults()
{
parent::populateDefaults();
if (!$this->Title) {
$this->Title = _t(__CLASS__ . '.NEWGROUP', "New Group");
}
}
public function getAllChildren()
{
$doSet = new ArrayList();
@ -105,6 +96,16 @@ class Group extends DataObject
return $doSet;
}
private function getDecodedBreadcrumbs()
{
$list = Group::get()->exclude('ID', $this->ID);
$groups = ArrayList::create();
foreach ($list as $group) {
$groups->push(['ID' => $group->ID, 'Title' => $group->getBreadcrumbs(' » ')]);
}
return $groups;
}
/**
* Caution: Only call on instances, not through a singleton.
@ -125,7 +126,7 @@ class Group extends DataObject
$parentidfield = DropdownField::create(
'ParentID',
$this->fieldLabel('Parent'),
Group::get()->exclude('ID', $this->ID)->map('ID', 'Breadcrumbs')
$this->getDecodedBreadcrumbs()
)->setEmptyString(' '),
new TextareaField('Description', $this->fieldLabel('Description'))
),

15
tests/php/Dev/CsvBulkLoaderTest.php
View File

@ -2,6 +2,7 @@
namespace SilverStripe\Dev\Tests;
use League\Csv\Writer;
use SilverStripe\Dev\Tests\CsvBulkLoaderTest\CustomLoader;
use SilverStripe\Dev\Tests\CsvBulkLoaderTest\Player;
use SilverStripe\Dev\Tests\CsvBulkLoaderTest\PlayerContract;
@ -300,6 +301,20 @@ class CsvBulkLoaderTest extends SapphireTest
$this->assertEquals($player->FirstName, "John. He's a good guy. ");
}
public function testLoadWithByteOrderMark()
{
$loader = new CsvBulkLoader(Player::class);
$loader->load($this->csvPath . 'PlayersWithHeaderAndBOM.csv');
$players = Player::get();
$this->assertCount(3, $players);
$this->assertListContains([
['FirstName' => 'Jamie', 'Birthday' => '1882-01-31'],
['FirstName' => 'Järg', 'Birthday' => '1982-06-30'],
['FirstName' => 'Jacob', 'Birthday' => '2000-04-30'],
], $players);
}
protected function getLineCount(&$file)
{

4
tests/php/Dev/CsvBulkLoaderTest/csv/PlayersWithHeaderAndBOM.csv Normal file
View File

@ -0,0 +1,4 @@
FirstName,Biography,Birthday,IsRegistered
Jamie,"Pretty old\, with an escaped comma",1882-01-31,1
Järg,"Unicode FTW",1982-06-30,1
Jacob," Likes leading tabs in his biography",2000-04-30,0
1 FirstName Biography Birthday IsRegistered
2 Jamie Pretty old\, with an escaped comma 1882-01-31 1
3 Järg Unicode FTW 1982-06-30 1
4 Jacob Likes leading tabs in his biography 2000-04-30 0