"MDL-16597, read subdirs parameters from moodleform"

diff --git a/lib/form/filemanager.js b/lib/form/filemanager.js
index be6b47995f12429872f0b195400deeb57c7e4c7d..1c3643bb6a96a4ce0ec63a09a2059dc96b15c006 100644 (file)
--- a/lib/form/filemanager.js
+++ b/lib/form/filemanager.js
@@ -15,7 +15,6 @@ var filemanager = (function(){
     function _filemanager() {
         this.init = function(client_id, options) {
             this.client_id = client_id;
-            var container = document.getElementById('filemanager-' + client_id);
             html_compiler(client_id, options);
         }
     }
@@ -656,10 +655,14 @@ function setup_buttons(client_id, options) {
         fm_launch_filepicker(this.options.target, this.options);
     }
     fileadd.options = fm_cfg[client_id];
-    foldercreate.onclick = function() {
-        mkdir(this.options.client_id, this.options.itemid);
+    if (fm_cfg[client_id].subdirs) {
+        foldercreate.onclick = function() {
+            mkdir(this.options.client_id, this.options.itemid);
+        }
+        foldercreate.options = fm_cfg[client_id];
+    } else {
+        foldercreate.style.display = 'none';
     }
-    foldercreate.options = fm_cfg[client_id];
     folderdownload.onclick = function() {
         var cb = {
             success:function(o) {

diff --git a/lib/form/filemanager.php b/lib/form/filemanager.php
index b03c93637abb35498baf9a6d2f36a7671fd2e363..72fd916437c6c1c4faebae288f7180144174385c 100644 (file)
--- a/lib/form/filemanager.php
+++ b/lib/form/filemanager.php
@@ -196,6 +196,7 @@ class MoodleQuickForm_filemanager extends HTML_QuickForm_element {
         $options->maxfiles  = $this->getMaxfiles();
         $options->client_id = $client_id;
         $options->itemid    = $draftitemid;
+        $options->subdirs   = $this->_options['subdirs'];
         $options->target    = $id;
 
         $html = $this->_getTabs();