summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@owncloud.com>2015-12-14 14:03:14 +0100
committerRoeland Jago Douma <rullzer@owncloud.com>2015-12-14 14:03:14 +0100
commit843cf906b1f9fd9adce3b5f4bc8ae364a83de69b (patch)
treed834b61497d46c45d232a0dcd48d88b3a15873c1 /apps
parentf2ac1a80d8833b49c10a2195adbb1df1a002cff5 (diff)
downloadnextcloud-server-843cf906b1f9fd9adce3b5f4bc8ae364a83de69b.tar.gz
nextcloud-server-843cf906b1f9fd9adce3b5f4bc8ae364a83de69b.zip
File shares can't have create permissions
fixes #21187
Diffstat (limited to 'apps')
-rw-r--r--apps/files_sharing/js/share.js3
-rw-r--r--apps/files_sharing/tests/js/sharedfilelistSpec.js2
2 files changed, 4 insertions, 1 deletions
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 3d105f283d8..f8d89828f4d 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -45,6 +45,9 @@
if (fileData.type === 'file') {
// files can't be shared with delete permissions
sharePermissions = sharePermissions & ~OC.PERMISSION_DELETE;
+
+ // create permissions don't mean anything for files
+ sharePermissions = sharePermissions & ~OC.PERMISSION_CREATE;
}
tr.attr('data-share-permissions', sharePermissions);
if (fileData.shareOwner) {
diff --git a/apps/files_sharing/tests/js/sharedfilelistSpec.js b/apps/files_sharing/tests/js/sharedfilelistSpec.js
index fdc9de49c17..0b0676a19e6 100644
--- a/apps/files_sharing/tests/js/sharedfilelistSpec.js
+++ b/apps/files_sharing/tests/js/sharedfilelistSpec.js
@@ -712,7 +712,7 @@ describe('OCA.Sharing.FileList tests', function() {
$tr = fileList.$el.find('tr:first');
expect(parseInt($tr.attr('data-share-permissions'), 10))
- .toEqual(OC.PERMISSION_ALL - OC.PERMISSION_SHARE - OC.PERMISSION_DELETE);
+ .toEqual(OC.PERMISSION_ALL - OC.PERMISSION_SHARE - OC.PERMISSION_DELETE - OC.PERMISSION_CREATE);
});
});
});