aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2014-05-26 20:32:24 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2014-05-26 20:32:24 +0200
commit36f63ea990eb8c1b93243361fafae35b8c5b7820 (patch)
tree891b9cbeffae091a55e236f8402a9e14ff7537ab /apps/files
parenta34491e28895f84d220cb5dbbbe4273172334716 (diff)
downloadnextcloud-server-36f63ea990eb8c1b93243361fafae35b8c5b7820.tar.gz
nextcloud-server-36f63ea990eb8c1b93243361fafae35b8c5b7820.zip
allow resharing of files with only share permissions
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/js/filelist.js14
1 files changed, 4 insertions, 10 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 3dcd9dd3eaa..72e1a688041 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -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