Merge pull request #21189 from owncloud/fix_21187
File shares can't have create permissions
This commit is contained in:
commit
1ecda59c24
|
@ -45,6 +45,9 @@
|
||||||
if (fileData.type === 'file') {
|
if (fileData.type === 'file') {
|
||||||
// files can't be shared with delete permissions
|
// files can't be shared with delete permissions
|
||||||
sharePermissions = sharePermissions & ~OC.PERMISSION_DELETE;
|
sharePermissions = sharePermissions & ~OC.PERMISSION_DELETE;
|
||||||
|
|
||||||
|
// create permissions don't mean anything for files
|
||||||
|
sharePermissions = sharePermissions & ~OC.PERMISSION_CREATE;
|
||||||
}
|
}
|
||||||
tr.attr('data-share-permissions', sharePermissions);
|
tr.attr('data-share-permissions', sharePermissions);
|
||||||
if (fileData.shareOwner) {
|
if (fileData.shareOwner) {
|
||||||
|
|
|
@ -712,7 +712,7 @@ describe('OCA.Sharing.FileList tests', function() {
|
||||||
$tr = fileList.$el.find('tr:first');
|
$tr = fileList.$el.find('tr:first');
|
||||||
|
|
||||||
expect(parseInt($tr.attr('data-share-permissions'), 10))
|
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);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue