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

MINOR: #4674 applied patch for special chars in folder titles

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97669 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Andreas Piening 2010-01-27 22:23:55 +00:00 committed by Sam Minnee
parent 00e5caf49c
commit 8ee148297a
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
filesystem/Folder.php
View File

@ -329,7 +329,6 @@ class Folder extends File {
* and implemeting updateCMSFields(FieldSet $fields) on that decorator. * and implemeting updateCMSFields(FieldSet $fields) on that decorator.
*/ */
function getCMSFields() { function getCMSFields() {
$nameField = ($this->ID > 0) ? new TextField("Name") : new HiddenField("Name");
$fileList = new AssetTableField( $fileList = new AssetTableField(
$this, $this,
"Files", "Files",
@ -340,7 +339,7 @@ class Folder extends File {
$fileList->setFolder($this); $fileList->setFolder($this);
$fileList->setPopupCaption(_t('Folder.VIEWEDITASSET', "View/Edit Asset")); $fileList->setPopupCaption(_t('Folder.VIEWEDITASSET', "View/Edit Asset"));
$nameField = ($this->ID && $this->ID != "root") ? new TextField("Name", _t('Folder.TITLE')) : new HiddenField("Name"); $titleField = ($this->ID && $this->ID != "root") ? new TextField("Title", _t('Folder.TITLE')) : new HiddenField("Title");
if( $this->canEdit() ) { if( $this->canEdit() ) {
$deleteButton = new InlineFormAction('deletemarked',_t('Folder.DELSELECTED','Delete selected files'), 'delete'); $deleteButton = new InlineFormAction('deletemarked',_t('Folder.DELSELECTED','Delete selected files'), 'delete');
$deleteButton->includeDefaultJS(false); $deleteButton->includeDefaultJS(false);
@ -349,10 +348,10 @@ class Folder extends File {
} }
$fields = new FieldSet( $fields = new FieldSet(
new HiddenField("Title"), new HiddenField("Name"),
new TabSet("Root", new TabSet("Root",
new Tab("Files", _t('Folder.FILESTAB', "Files"), new Tab("Files", _t('Folder.FILESTAB', "Files"),
$nameField, $titleField,
$fileList, $fileList,
$deleteButton, $deleteButton,
new HiddenField("FileIDs"), new HiddenField("FileIDs"),