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

MINOR Fixed ParentID setting in AssetAdmin->doAdd() and using instead of

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92812 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2009-11-21 03:19:29 +00:00
parent 6aae0aaf53
commit 5738c57d8a
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
code/AssetAdmin.php
View File

@ -303,6 +303,9 @@ HTML;
if($record) { if($record) {
$fields = $record->getCMSFields(); $fields = $record->getCMSFields();
// Required for file tree setup
if(!$fields->dataFieldByName('ParentID')) $fields->push(new HiddenField('ParentID'));
$actions = new FieldSet(); $actions = new FieldSet();
// Only show save button if not 'assets' folder // Only show save button if not 'assets' folder
@ -536,13 +539,13 @@ JS;
/** /**
* Add a new folder and return its details suitable for ajax. * Add a new folder and return its details suitable for ajax.
*/ */
public function doAdd() { public function doAdd($data, $form) {
$parent = ($_REQUEST['ParentID'] && is_numeric($_REQUEST['ParentID'])) ? (int)$_REQUEST['ParentID'] : 0; $parentID = (isset($data['ParentID']) && is_numeric($data['ParentID'])) ? (int)$data['ParentID'] : 0;
$name = (isset($_REQUEST['Name'])) ? basename($_REQUEST['Name']) : _t('AssetAdmin.NEWFOLDER',"NewFolder"); $name = (isset($data['Name'])) ? basename($data['Name']) : _t('AssetAdmin.NEWFOLDER',"NewFolder");
if($parent) { if($parentID) {
$parentObj = DataObject::get_by_id('File', $parent); $parentObj = DataObject::get_by_id('File', $parentID);
if(!$parentObj || !$parentObj->ID) $parent = 0; if(!$parentObj || !$parentObj->ID) $parentID = 0;
} }
// Get the folder to be created // Get the folder to be created
@ -555,21 +558,12 @@ JS;
} }
$p = new Folder(); $p = new Folder();
$p->ParentID = $parent; $p->ParentID = $parentID;
$p->Name = $p->Title = basename($filename); $p->Name = $p->Title = basename($filename);
// Ensure uniqueness
$i = 2;
$baseFilename = substr($p->Filename, 0, -1) . '-';
while(file_exists($p->FullPath)) {
$p->Filename = $baseFilename . $i . '/';
$i++;
}
$p->write(); $p->write();
// Used in TinyMCE inline folder creation // Used in TinyMCE inline folder creation
if(isset($_REQUEST['returnID'])) { if(isset($data['returnID'])) {
return $p->ID; return $p->ID;
} else { } else {
$form = $this->getEditForm($p->ID); $form = $this->getEditForm($p->ID);