mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8728 from owncloud/sharing_fix_reshare 

allow resharing of files with only share permissions
This commit is contained in:
Vincent Petry 2014-05-27 09:02:52 +02:00
parent a756666585 36f63ea990
commit a79f3fd1c0
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/files/js/filelist.js
View File

@ -522,12 +522,6 @@
mime = mime || 'httpd/unix-directory';
}
// user should always be able to rename a share mount point
var allowRename = 0;
if (fileData.isShareMountPoint) {
allowRename = OC.PERMISSION_UPDATE;
}
//containing tr
var tr = $('<tr></tr>').attr({
"data-id" : fileData.id,
@ -537,7 +531,7 @@
"data-mime": mime,
"data-mtime": mtime,
"data-etag": fileData.etag,
"data-permissions": fileData.permissions | allowRename || this.getDirectoryPermissions()
"data-permissions": fileData.permissions || this.getDirectoryPermissions()
});
if (type === 'dir') {
@ -936,7 +930,7 @@
/**
* Lazy load a file's preview.
*
*
* @param path path of the file
* @param mime mime type
* @param callback callback function to call when the image was loaded
@ -1639,7 +1633,7 @@
if (fileDirectory.length === 1) {
fileDirectory = fileDirectory[0];
// Get the directory
// Get the directory
var fd = self.findFileEl(fileDirectory);
if (fd.length === 0) {
var dir = {
@ -1655,7 +1649,7 @@
} else {
fileDirectory = fileDirectory[0];
}
fileDirectory = self.findFileEl(fileDirectory);
// update folder size

11
apps/files_sharing/js/share.js
View File

@ -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) {