Merge pull request unclecheese#18 from jonom/master

Made so if UploadFolder is set Import interface loads that folder
klitsche · Nov 18, 2011 · 33e01b3 · 33e01b3
2 parents df1609a + 14423d3
commit 33e01b3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/code/UploadifyField.php b/code/UploadifyField.php
@@ -506,8 +506,10 @@ public function FolderDropdown($id = null) {
 	 * @return DropdownField
 	 */
 	public function ImportDropdown() {
+		$UploadFolder = $this->getUploadFolder();
+		$id = ($UploadFolder!="Uploads") ? Folder::findOrMake($UploadFolder)->ID : null;
 		$class = (class_exists("SimpleTreeDropdownField")) ? "SimpleTreeDropdownField" : "DropdownField";
-		$d = new $class("ImportFolderID_{$this->id()}", _t('Uploadify.CHOOSEIMPORTFOLDER','Choose a folder'), "Folder", null, "Filename");
+		$d = new $class("ImportFolderID_{$this->id()}", _t('Uploadify.CHOOSEIMPORTFOLDER','Choose a folder'), "Folder", $id, "Filename");
 		$d->setEmptyString('-- ' . _t('Uploadify.PLEASESELECT','Select a folder') . ' --');
 		$d->addExtraClass("{'url' : '".$this->Link('importlist')."' }");
 		return $d;

diff --git a/javascript/uploadify_init.js b/javascript/uploadify_init.js
@@ -210,7 +210,7 @@ $(function() {
 				});	
 			}
 		});
-	});
+	}).change();
 
 	$('.import_dropdown button').live("click", function() {
 		url = $(this).metadata().url;