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

BUG Fix root folder getFilename() returning incorrect path (#6510)

Browse Source
This commit is contained in:
Damian Mooyman 2017-01-17 17:49:42 +13:00 committed by Sam Minnée
parent 6bd7a6f00b
commit d192a4f86f
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Assets/File.php
View File

@ -4,6 +4,7 @@ namespace SilverStripe\Assets;
use SilverStripe\Admin\AdminRootController; use SilverStripe\Admin\AdminRootController;
use SilverStripe\Admin\CMSPreviewable; use SilverStripe\Admin\CMSPreviewable;
use SilverStripe\Assets\Storage\AssetNameGenerator;
use SilverStripe\Assets\Storage\DBFile; use SilverStripe\Assets\Storage\DBFile;
use SilverStripe\Assets\Storage\AssetContainer; use SilverStripe\Assets\Storage\AssetContainer;
use SilverStripe\CMS\Model\SiteTree; use SilverStripe\CMS\Model\SiteTree;

12
src/Assets/Folder.php
View File

@ -46,18 +46,6 @@ class Folder extends File
return $this->isInDB(); return $this->isInDB();
} }
/**
*
*/
public function populateDefaults()
{
parent::populateDefaults();
if (!$this->Name) {
$this->Name = _t('AssetAdmin.NEWFOLDER', "NewFolder");
}
}
/** /**
* Find the given folder or create it as a database record * Find the given folder or create it as a database record
* *

6
tests/php/Assets/FolderTest.php
View File

@ -293,4 +293,10 @@ class FolderTest extends SapphireTest
$this->assertEquals($newFolder->Name, $newFolder->Title); $this->assertEquals($newFolder->Name, $newFolder->Title);
$this->assertEquals($newFolder->Title, 'TestTitleWithIllegalCharactersCopiedToName <!BANG!>'); $this->assertEquals($newFolder->Title, 'TestTitleWithIllegalCharactersCopiedToName <!BANG!>');
} }
public function testRootFolder()
{
$root = Folder::singleton();
$this->assertEquals('/', $root->getFilename());
}
} }