aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_sharing/js/share.js
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-05-27 09:02:52 +0200
committerVincent Petry <pvince81@owncloud.com>2014-05-27 09:02:52 +0200
commita79f3fd1c0ddf9b8ac4d59ce2affccd4aabf83a0 (patch)
tree4ceaa19e28a7cfdc4447a3d5c19c071547bb0a0c /apps/files_sharing/js/share.js
parenta756666585be41752e376cb42fd445b8155b1d74 (diff)
parent36f63ea990eb8c1b93243361fafae35b8c5b7820 (diff)
downloadnextcloud-server-a79f3fd1c0ddf9b8ac4d59ce2affccd4aabf83a0.tar.gz
nextcloud-server-a79f3fd1c0ddf9b8ac4d59ce2affccd4aabf83a0.zip
Merge pull request #8728 from owncloud/sharing_fix_reshare
allow resharing of files with only share permissions
Diffstat (limited to 'apps/files_sharing/js/share.js')
-rw-r--r--apps/files_sharing/js/share.js11
1 files changed, 10 insertions, 1 deletions
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 893577db2e3..84c5bf57b38 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -21,6 +21,11 @@ $(document).ready(function() {
var tr = oldCreateRow.apply(this, arguments);
if (fileData.shareOwner) {
tr.attr('data-share-owner', fileData.shareOwner);
+ // user should always be able to rename a mount point
+ if (fileData.isShareMountPoint) {
+ tr.attr('data-permissions', fileData.permissions | OC.PERMISSION_UPDATE);
+ tr.attr('data-reshare-permissions', fileData.permissions);
+ }
}
return tr;
};
@@ -78,7 +83,11 @@ $(document).ready(function() {
if ($(tr).data('type') == 'dir') {
itemType = 'folder';
}
- var possiblePermissions = $(tr).data('permissions');
+ var possiblePermissions = $(tr).data('reshare-permissions');
+ if (_.isUndefined(possiblePermissions)) {
+ possiblePermissions = $(tr).data('permissions');
+ }
+
var appendTo = $(tr).find('td.filename');
// Check if drop down is already visible for a different file
if (OC.Share.droppedDown) {