diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2016-12-06 22:53:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-06 22:53:46 +0100 |
| commit | c776aa92820ed0375e9a95f31de64d09002969c4 (patch) | |
| tree | 23d74929a4e85164274d4b5fe57761193a6c3299 | |
| parent | 0b0f27358f67382f4c45f469db50de8f17f72bce (diff) | |
| parent | 7e2b866fd713aae60dc6f021cef7d9fd4725b75f (diff) | |
| download | nextcloud-server-c776aa92820ed0375e9a95f31de64d09002969c4.tar.gz nextcloud-server-c776aa92820ed0375e9a95f31de64d09002969c4.zip | |
Merge pull request #2530 from nextcloud/fix-change-permissions-mail-shares-on-folder
fix change permission on mail shares of folders
| -rw-r--r-- | apps/files/js/file-upload.js | 2 | ||||
| -rw-r--r-- | core/js/sharedialogshareelistview.js | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index 8bcaa2e24aa..b3a59b54241 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -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'; diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js index 7fcda92d5fd..a0a7bbfa2dc 100644 --- a/core/js/sharedialogshareelistview.js +++ b/core/js/sharedialogshareelistview.js @@ -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; |