From 9c249427d1f16e56a4f96dd8eddc2ad8c8a81df0 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Tue, 6 Dec 2016 13:44:27 +0100 Subject: [PATCH 1/4] fix change permission on mail shares of folders Signed-off-by: Arthur Schiwon --- core/js/sharedialogshareelistview.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js index 7fcda92d5fd..2d77506229a 100644 --- a/core/js/sharedialogshareelistview.js +++ b/core/js/sharedialogshareelistview.js @@ -372,10 +372,9 @@ checked = numberChecked > 0; $('input[name="edit"]', $li).prop('checked', checked); } - } else { - if ($element.attr('name') === 'edit' && $element.is(':checked')) { - permissions |= OC.PERMISSION_UPDATE; - } + } + if ($element.attr('name') === 'edit' && $element.is(':checked')) { + permissions |= OC.PERMISSION_UPDATE; } $('.permissions', $li).not('input[name="edit"]').filter(':checked').each(function(index, checkbox) { From 02f26751ceecdedb1df9213834c6be339ecb88bd Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Tue, 6 Dec 2016 15:22:33 +0100 Subject: [PATCH 2/4] set full edit permissions Signed-off-by: Arthur Schiwon --- core/js/sharedialogshareelistview.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js index 2d77506229a..4c197a6a253 100644 --- a/core/js/sharedialogshareelistview.js +++ b/core/js/sharedialogshareelistview.js @@ -374,7 +374,7 @@ } } if ($element.attr('name') === 'edit' && $element.is(':checked')) { - permissions |= OC.PERMISSION_UPDATE; + permissions |= OC.PERMISSION_CREATE | OC.PERMISSION_UPDATE | OC.PERMISSION_READ | OC.PERMISSION_DELETE; } $('.permissions', $li).not('input[name="edit"]').filter(':checked').each(function(index, checkbox) { From c2062a93a3eb57c01609a89775c8551b92cc9013 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Tue, 6 Dec 2016 15:41:10 +0100 Subject: [PATCH 3/4] set different permissions if file or folder Signed-off-by: Arthur Schiwon --- core/js/sharedialogshareelistview.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js index 4c197a6a253..a0a7bbfa2dc 100644 --- a/core/js/sharedialogshareelistview.js +++ b/core/js/sharedialogshareelistview.js @@ -367,14 +367,18 @@ 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; $('input[name="edit"]', $li).prop('checked', checked); } - } - if ($element.attr('name') === 'edit' && $element.is(':checked')) { - permissions |= OC.PERMISSION_CREATE | OC.PERMISSION_UPDATE | OC.PERMISSION_READ | OC.PERMISSION_DELETE; + } else { + if ($element.attr('name') === 'edit' && $element.is(':checked')) { + permissions |= OC.PERMISSION_UPDATE; + } } $('.permissions', $li).not('input[name="edit"]').filter(':checked').each(function(index, checkbox) { From 7e2b866fd713aae60dc6f021cef7d9fd4725b75f Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Tue, 6 Dec 2016 18:08:13 +0100 Subject: [PATCH 4/4] fix type in jsdoc Signed-off-by: Arthur Schiwon --- apps/files/js/file-upload.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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';