Merge pull request #34657 from nextcloud/backport/34625/stable25

[stable25] Fix icon of encrypted folders in filepicker
nextcloud · Oct 27, 2022 · f30b8df · f30b8df
2 parents b45848d + 2887ee0
commit f30b8df
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/core/src/OC/dialogs.js b/core/src/OC/dialogs.js
@@ -1236,7 +1236,12 @@ const Dialogs = {
 		self.$filelist.empty();
 
 		$.each(files, function(idx, entry) {
-			entry.icon = OC.MimeType.getIconUrl(entry.mimetype)
+			if (entry.isEncrypted && entry.mimetype === 'httpd/unix-directory') {
+				entry.icon = OC.MimeType.getIconUrl('dir-encrypted')
+			} else {
+				entry.icon = OC.MimeType.getIconUrl(entry.mimetype)
+			}
+
 			var simpleSize, sizeColor
 			if (typeof (entry.size) !== 'undefined' && entry.size >= 0) {
 				simpleSize = OC.Util.humanFileSize(parseInt(entry.size, 10), true)

diff --git a/dist/core-login.js b/dist/core-login.js
diff --git a/dist/core-login.js.map b/dist/core-login.js.map
diff --git a/dist/core-main.js b/dist/core-main.js
diff --git a/dist/core-main.js.map b/dist/core-main.js.map