diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-15 13:18:22 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-15 13:18:22 +0100 |
| commit | 1ecda59c2412164e95db452b43d11b28f1b7c64a (patch) | |
| tree | 1c9a264aade1d39213182c7806c7c681999e7050 /apps/files_sharing | |
| parent | 67263ef8b4b01ccf014ebffd48a3deab466878cf (diff) | |
| parent | 843cf906b1f9fd9adce3b5f4bc8ae364a83de69b (diff) | |
| download | nextcloud-server-1ecda59c2412164e95db452b43d11b28f1b7c64a.tar.gz nextcloud-server-1ecda59c2412164e95db452b43d11b28f1b7c64a.zip | |
Merge pull request #21189 from owncloud/fix_21187
File shares can't have create permissions
Diffstat (limited to 'apps/files_sharing')
| -rw-r--r-- | apps/files_sharing/js/share.js | 3 | ||||
| -rw-r--r-- | apps/files_sharing/tests/js/sharedfilelistSpec.js | 2 |
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); }); }); }); |