From 270558807309025a01ff456b94d3350eaab1ac41 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 9 Sep 2014 16:41:49 +0200 Subject: Dont' use mountpoint permissions as share permissions for external storages --- apps/files_sharing/js/share.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'apps/files_sharing/js/share.js') diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index eccd21c9248..dd950e9b42b 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -19,6 +19,10 @@ OCA.Files.FileList.prototype._createRow = function(fileData) { var tr = oldCreateRow.apply(this, arguments); var sharePermissions = fileData.permissions; + if (fileData.mountType && fileData.mountType === "external-root"){ + // for external storages we cant use the permissions of the mountpoint + sharePermissions = OC.PERMISSION_ALL; + } if (fileData.type === 'file') { // files can't be shared with delete permissions sharePermissions = sharePermissions & ~OC.PERMISSION_DELETE; -- cgit v1.2.3 From 307071cfec088c2690c12a686578b49647ba5840 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 16 Sep 2014 20:54:11 +0200 Subject: Keep the share permissions from mountpoints --- apps/files_sharing/js/share.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'apps/files_sharing/js/share.js') diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index dd950e9b42b..853e9f689f6 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -21,7 +21,8 @@ var sharePermissions = fileData.permissions; if (fileData.mountType && fileData.mountType === "external-root"){ // for external storages we cant use the permissions of the mountpoint - sharePermissions = OC.PERMISSION_ALL; + // instead we show all permissions and only use the share permissions from the mountpoint to handle resharing + sharePermissions = sharePermissions | (OC.PERMISSION_ALL & ~OC.PERMISSION_SHARE); } if (fileData.type === 'file') { // files can't be shared with delete permissions -- cgit v1.2.3