diff options
| author | Carl Schwan <carl@carlschwan.eu> | 2022-10-18 16:59:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-18 16:59:57 +0200 |
| commit | 39c3907f8b6596f705eb6a65be52f0096954217f (patch) | |
| tree | 1fd112279f242fa82954f2996b71a83cd61103fc /core | |
| parent | 0270068fedd0282585bb5d2ffd5c823932a8ea72 (diff) | |
| parent | 945edfefcdfee3f6f3bb29303903b13658af0551 (diff) | |
| download | nextcloud-server-39c3907f8b6596f705eb6a65be52f0096954217f.tar.gz nextcloud-server-39c3907f8b6596f705eb6a65be52f0096954217f.zip | |
Merge pull request #34625 from nextcloud/fix/filepicker-endtoend
Fix icon of encrypted folders in filepicker
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/OC/dialogs.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/src/OC/dialogs.js b/core/src/OC/dialogs.js index 55fd239cf22..c29d59aaad8 100644 --- 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) |