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 /apps/files/js/filelist.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 'apps/files/js/filelist.js')
| -rw-r--r-- | apps/files/js/filelist.js | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 10efa54496a..fa9819b78b5 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -950,7 +950,8 @@ type: $el.attr('data-type'), etag: $el.attr('data-etag'), permissions: parseInt($el.attr('data-permissions'), 10), - hasPreview: $el.attr('data-has-preview') === 'true' + hasPreview: $el.attr('data-has-preview') === 'true', + isEncrypted: $el.attr('data-e2eencrypted') === 'true' }; var size = $el.attr('data-size'); if (size) { @@ -1152,7 +1153,10 @@ if (type === 'dir') { mime = mime || 'httpd/unix-directory'; - if (fileData.mountType && fileData.mountType.indexOf('external') === 0) { + if (fileData.isEncrypted) { + icon = OC.MimeType.getIconUrl('dir-encrypted'); + dataIcon = icon; + } else if (fileData.mountType && fileData.mountType.indexOf('external') === 0) { icon = OC.MimeType.getIconUrl('dir-external'); dataIcon = icon; } @@ -1173,7 +1177,8 @@ "data-mtime": mtime, "data-etag": fileData.etag, "data-permissions": permissions, - "data-has-preview": fileData.hasPreview !== false + "data-has-preview": fileData.hasPreview !== false, + "data-e2eencrypted": fileData.isEncrypted === true }); if (dataIcon) { @@ -1444,7 +1449,9 @@ path = fileData.path || this.getCurrentDirectory(), permissions = parseInt(fileData.permissions, 10) || 0; - if (fileData.isShareMountPoint) { + var isEndToEndEncrypted = (type === 'dir' && fileData.isEncrypted); + + if (!isEndToEndEncrypted && fileData.isShareMountPoint) { permissions = permissions | OC.PERMISSION_UPDATE; } |