diff options
| author | Tobias Kaminsky <tobiasKaminsky@users.noreply.github.com> | 2017-12-06 16:19:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-06 16:19:17 +0100 |
| commit | 430f60db21bbda895825bdb37632b5d68dff1f6e (patch) | |
| tree | cf1fac2ea8bbbfaeeaf17a575657a7bbb7777e5b /core/js/share.js | |
| parent | c32cb6b4b79baeb86f5702d20db0d4b6ed874d86 (diff) | |
| parent | 7bc28f14de8c3d77ec611a4ffd8ad48dc6093cea (diff) | |
| download | nextcloud-server-430f60db21bbda895825bdb37632b5d68dff1f6e.tar.gz nextcloud-server-430f60db21bbda895825bdb37632b5d68dff1f6e.zip | |
Merge pull request #6670 from nextcloud/handle-encryption-state-in-web-interface
Handle encryption state in web interface
Diffstat (limited to 'core/js/share.js')
| -rw-r--r-- | core/js/share.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/js/share.js b/core/js/share.js index 7662d6cffb9..f301de25415 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -281,10 +281,14 @@ OC.Share = _.extend(OC.Share || {}, { $tr.find('.filename .thumbnail').css('background-image', 'url(' + shareFolderIcon + ')'); $tr.attr('data-icon', shareFolderIcon); } else if (type === 'dir') { + var isEncrypted = $tr.attr('data-e2eencrypted'); var mountType = $tr.attr('data-mounttype'); // FIXME: duplicate of FileList._createRow logic for external folder, // need to refactor the icon logic into a single code path eventually - if (mountType && mountType.indexOf('external') === 0) { + if (isEncrypted === 'true') { + shareFolderIcon = OC.MimeType.getIconUrl('dir-encrypted'); + $tr.attr('data-icon', shareFolderIcon); + } else if (mountType && mountType.indexOf('external') === 0) { shareFolderIcon = OC.MimeType.getIconUrl('dir-external'); $tr.attr('data-icon', shareFolderIcon); } else { |