upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 08:16:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #2530 from nextcloud/fix-change-permissions-mail-shares-on-folder

Browse source 
fix change permission on mail shares of folders
This commit is contained in:
blizzz 2016-12-06 22:53:46 +01:00 committed by GitHub
commit c776aa9282
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files/js/file-upload.js
View file

@ -151,7 +151,7 @@ OC.FileUpload.prototype = {
/**
* Returns whether the upload is in progress
*
* @return {bool}
* @return {boolean}
*/
isPending: function() {
return this.data.state() === 'pending';

3
core/js/sharedialogshareelistview.js
View file

@ -367,6 +367,9 @@
checked = $element.is(':checked');
// Check/uncheck Create, Update, and Delete checkboxes if Edit is checked/unck
$($checkboxes).prop('checked', checked);
if (checked) {
permissions |= OC.PERMISSION_CREATE | OC.PERMISSION_UPDATE | OC.PERMISSION_DELETE;
}
} else {
var numberChecked = $checkboxes.filter(':checked').length;
checked = numberChecked > 0;