Merge branch 'v3' of https://github.com/craftcms/cms into develop

# Conflicts: # CHANGELOG.md # src/web/assets/cp/dist/cp.js # src/web/assets/cp/dist/cp.js.map
craftcms · Mar 20, 2023 · 909feea · 909feea
2 parents 0da1ad6 + e39861b
commit 909feea
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,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))
 - Fixed an error that could occur when rebuilding the project config, if there were any custom source definitions for element types that weren’t Composer-installed. ([#12881](https://github.com/craftcms/cms/issues/12881))
 - Fixed an XSS vulnerability.
 

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
@@ -388,7 +388,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,
       });