From 1f190eb6989a2ab3b82d01908c26984b8101b80c Mon Sep 17 00:00:00 2001
From: Stig Lindqvist <stig@silverstripe.com>
Date: Tue, 10 Jan 2012 14:01:25 +1300
Subject: [PATCH 1/2] BUGFIX: Return a RootForm for AssetAdmin so Form get the
 correct Fields on POST

Solves issues with GridField and uploading on the root folder (/assets/)
---
 code/controllers/AssetAdmin.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/code/controllers/AssetAdmin.php b/code/controllers/AssetAdmin.php
index 6bfbc76c..e1e0de63 100644
--- a/code/controllers/AssetAdmin.php
+++ b/code/controllers/AssetAdmin.php
@@ -85,6 +85,15 @@ JS
 		CMSBatchActionHandler::register('delete', 'AssetAdmin_DeleteBatchAction', 'Folder');
 	}
 		
+	/**
+	 * Return the root 'asset' folder CMSFields
+	 * 
+	 * @return FieldList
+	 */
+	public function RootForm() {
+		return $this->getEditForm(singleton('Folder'));
+	}
+	
 	/**
 	 * Show the content of the upload iframe.  The form is specified by a template.
 	 */

From 7de585103f35dbcfbf9986ef78b0f6b50d213d33 Mon Sep 17 00:00:00 2001
From: Stig Lindqvist <stig@silverstripe.com>
Date: Tue, 10 Jan 2012 14:02:19 +1300
Subject: [PATCH 2/2] BUGFIX: Can't upload files to root folder

---
 code/controllers/AssetAdmin.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/code/controllers/AssetAdmin.php b/code/controllers/AssetAdmin.php
index e1e0de63..00b8cd55 100644
--- a/code/controllers/AssetAdmin.php
+++ b/code/controllers/AssetAdmin.php
@@ -202,8 +202,11 @@ JS
 		}
 		$processedData = array_reverse($processedData);
 				
-		if($data['FolderID'] && $data['FolderID'] != '') $folder = DataObject::get_by_id("Folder", $data['FolderID']);
-		else $folder = singleton('Folder');
+		if(isset($data['FolderID']) && is_numeric($data['FolderID'])) {
+			$folder = DataObject::get_by_id("Folder", $data['FolderID']);
+		} else {
+			$folder = singleton('Folder');
+		}
 
 		foreach($processedFiles as $filePostId => $tmpFile) {
 			if($tmpFile['error'] == UPLOAD_ERR_NO_TMP_DIR) {