From 1e87e05e0b1f7fb548fc5b91a464d83e48ee7d53 Mon Sep 17 00:00:00 2001 From: Andrew O'Neil Date: Thu, 13 Dec 2007 22:03:48 +0000 Subject: [PATCH] Merged revisions 46433 via svnmerge from svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.2.0-privacy ........ r46433 | aoneil | 2007-12-06 15:23:18 +1300 (Thu, 06 Dec 2007) | 2 lines Some basic styling for HasManFileField ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46790 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/AssetAdmin.php | 16 ++++++++++++++++ code/LeftAndMain.php | 1 + 2 files changed, 17 insertions(+) diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php index ba23599a..2dce649f 100755 --- a/code/AssetAdmin.php +++ b/code/AssetAdmin.php @@ -204,8 +204,24 @@ HTML; $statusMessage = _t('AssetAdmin.NOTHINGTOUPLOAD','There was nothing to upload'); $status = ""; } + + + $fileIDs = array(); + $fileNames = array(); + foreach($newFiles as $newFile) { + $fileIDs[] = $newFile; + $fileObj = DataObject::get_one('File', "`File`.ID=$newFile"); + $fileNames[] = $fileObj->Name; + } + + $sFileIDs = implode(',', $fileIDs); + $sFileNames = implode(',', $fileNames); + echo << + /* IDs: $sFileIDs */ + /* Names: $sFileNames */ + var form = parent.document.getElementById('Form_EditForm'); form.getPageFromServer(form.elements.ID.value); parent.statusMessage("{$statusMessage}","{$status}"); diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php index 7dc2e8d7..1f8e0ad1 100644 --- a/code/LeftAndMain.php +++ b/code/LeftAndMain.php @@ -135,6 +135,7 @@ abstract class LeftAndMain extends Controller { Requirements::javascript('cms/javascript/Upload.js'); Requirements::javascript('sapphire/javascript/HasManyFileField.js'); + Requirements::css('sapphire/css/HasManyFileField.css'); Requirements::themedCSS('typography');