mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Merge branch '4.3' into 4.4
This commit is contained in:
commit
24015c7767
@ -76,6 +76,7 @@ class CsvBulkLoader extends BulkLoader
|
|||||||
$filepath = Director::getAbsFile($filepath);
|
$filepath = Director::getAbsFile($filepath);
|
||||||
$csvReader = Reader::createFromPath($filepath, 'r');
|
$csvReader = Reader::createFromPath($filepath, 'r');
|
||||||
$csvReader->setDelimiter($this->delimiter);
|
$csvReader->setDelimiter($this->delimiter);
|
||||||
|
$csvReader->stripBom(true);
|
||||||
|
|
||||||
$tabExtractor = function ($row, $rowOffset, $iterator) {
|
$tabExtractor = function ($row, $rowOffset, $iterator) {
|
||||||
foreach ($row as &$item) {
|
foreach ($row as &$item) {
|
||||||
|
@ -83,15 +83,6 @@ class Group extends DataObject
|
|||||||
|
|
||||||
private static $table_name = "Group";
|
private static $table_name = "Group";
|
||||||
|
|
||||||
public function populateDefaults()
|
|
||||||
{
|
|
||||||
parent::populateDefaults();
|
|
||||||
|
|
||||||
if (!$this->Title) {
|
|
||||||
$this->Title = _t(__CLASS__ . '.NEWGROUP', "New Group");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getAllChildren()
|
public function getAllChildren()
|
||||||
{
|
{
|
||||||
$doSet = new ArrayList();
|
$doSet = new ArrayList();
|
||||||
@ -106,6 +97,16 @@ class Group extends DataObject
|
|||||||
return $doSet;
|
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.
|
* Caution: Only call on instances, not through a singleton.
|
||||||
* The "root group" fields will be created through {@link SecurityAdmin->EditForm()}.
|
* The "root group" fields will be created through {@link SecurityAdmin->EditForm()}.
|
||||||
@ -125,7 +126,7 @@ class Group extends DataObject
|
|||||||
$parentidfield = DropdownField::create(
|
$parentidfield = DropdownField::create(
|
||||||
'ParentID',
|
'ParentID',
|
||||||
$this->fieldLabel('Parent'),
|
$this->fieldLabel('Parent'),
|
||||||
Group::get()->exclude('ID', $this->ID)->map('ID', 'Breadcrumbs')
|
$this->getDecodedBreadcrumbs()
|
||||||
)->setEmptyString(' '),
|
)->setEmptyString(' '),
|
||||||
new TextareaField('Description', $this->fieldLabel('Description'))
|
new TextareaField('Description', $this->fieldLabel('Description'))
|
||||||
),
|
),
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace SilverStripe\Dev\Tests;
|
namespace SilverStripe\Dev\Tests;
|
||||||
|
|
||||||
|
use League\Csv\Writer;
|
||||||
use SilverStripe\Dev\Tests\CsvBulkLoaderTest\CustomLoader;
|
use SilverStripe\Dev\Tests\CsvBulkLoaderTest\CustomLoader;
|
||||||
use SilverStripe\Dev\Tests\CsvBulkLoaderTest\Player;
|
use SilverStripe\Dev\Tests\CsvBulkLoaderTest\Player;
|
||||||
use SilverStripe\Dev\Tests\CsvBulkLoaderTest\PlayerContract;
|
use SilverStripe\Dev\Tests\CsvBulkLoaderTest\PlayerContract;
|
||||||
@ -300,6 +301,20 @@ class CsvBulkLoaderTest extends SapphireTest
|
|||||||
$this->assertEquals($player->FirstName, "John. He's a good guy. ");
|
$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)
|
protected function getLineCount(&$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
|
|
Loading…
Reference in New Issue
Block a user