Fixed #12927

craftcms · Mar 20, 2023 · e39861b · e39861b
1 parent e2f7e7b
commit e39861b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - The `|json_encode` Twig filter now calls `craft\helpers\Json::encode()` internally, improving error handling. ([#12919](https://github.com/craftcms/cms/issues/12919))
 - `craft\helpers\Json::encode()` no longer sets the `JSON_UNESCAPED_SLASHES` flag by default.
 - Fixed a JavaScript error that occurred when resolving an asset move conflict. ([#12920](https://github.com/craftcms/cms/issues/12920))
+- Fixed a bug where volume subfolders were being shown when viewing soft-deleted assets. ([#12927](https://github.com/craftcms/cms/issues/12927))
 
 ## 3.8.3 - 2023-03-16
 

diff --git a/src/web/assets/cp/dist/cp.js b/src/web/assets/cp/dist/cp.js
diff --git a/src/web/assets/cp/dist/cp.js.map b/src/web/assets/cp/dist/cp.js.map
diff --git a/src/web/assets/cp/src/js/AssetIndex.js b/src/web/assets/cp/src/js/AssetIndex.js
@@ -381,7 +381,7 @@ Craft.AssetIndex = Craft.BaseElementIndex.extend(
 
     getViewParams: function () {
       const data = Object.assign(this.base(), {
-        showFolders: this.settings.showFolders,
+        showFolders: this.settings.showFolders && !this.trashed,
         foldersOnly: this.settings.foldersOnly,
       });