Merge pull request #310 from concretecms/fix-11691

Fix concretecms/concretecms#11691
concretecms · Oct 4, 2023 · e3f93fe · e3f93fe
2 parents c498152 + 73efa8d
commit e3f93fe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/assets/cms/js/file-manager/uploader.js b/assets/cms/js/file-manager/uploader.js
@@ -390,6 +390,12 @@
                             directoryId = parseInt(fileUploader.options.folderID())
                         }
 
+                        // Fix in #11691
+                        const $directoryInput = $('<input />').attr('type', 'hidden').attr('name', 'fileUploaderDirectoryId').val(directoryId)
+                        $column.append($directoryInput)
+
+                        /*
+                        // Commented out for the time being to fix #11691
                         const $directoryContainer = $('<div/>')
                             .attr('style', 'min-height: 200px')
                         $directoryContainer.html('<concrete-file-directory-input input-label="Upload files to" :directory-id="' + directoryId + '" input-name="uploadDirectoryId" :show-add-directory-button="true" @change="currentFolder = $event"></concrete-file-directory-input>')
@@ -411,6 +417,7 @@
                                 }
                             })
                         })
+                        */
 
                         $row.append($column)
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@concretecms/bedrock",
-  "version": "1.4.8",
+  "version": "1.4.9",
   "description": "The asset framework and dependencies for Concrete CMS.",
   "scripts": {
     "lint": "standardx \"**/*.{js,vue}\" && stylelint assets/**/*.{scss,vue}",