summaryrefslogtreecommitdiffstats
path: root/apps/files/js
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-04-30 17:42:35 +0200
committerVincent Petry <pvince81@owncloud.com>2014-05-30 10:06:29 +0200
commit6ebc43650554f41eee2ae715b99a178b9c75c532 (patch)
tree8b1f0a76ec2b3281bbc6608d69f609ff79aff3ef /apps/files/js
parentdbbb6c5945f9c4d73695fa210be88d35ff35f026 (diff)
downloadnextcloud-server-6ebc43650554f41eee2ae715b99a178b9c75c532.tar.gz
nextcloud-server-6ebc43650554f41eee2ae715b99a178b9c75c532.zip
Added sharing overview page (WIP)
- added sharing overview entries in the sidebar - use OCS Share API to get the list of files
Diffstat (limited to 'apps/files/js')
-rw-r--r--apps/files/js/filelist.js10
1 files changed, 6 insertions, 4 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 72e1a688041..7887bdcda55 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -515,6 +515,7 @@
type = fileData.type || 'file',
mtime = parseInt(fileData.mtime, 10) || new Date().getTime(),
mime = fileData.mimetype,
+ path = fileData.path || this.getCurrentDirectory(),
linkUrl;
options = options || {};
@@ -550,10 +551,10 @@
// linkUrl
if (type === 'dir') {
- linkUrl = this.linkTo(this.getCurrentDirectory() + '/' + name);
+ linkUrl = this.linkTo(path + '/' + name);
}
else {
- linkUrl = this.getDownloadUrl(name, this.getCurrentDirectory());
+ linkUrl = this.getDownloadUrl(name, path);
}
td.append('<input id="select-' + this.id + '-' + fileData.id +
'" type="checkbox" /><label for="select-' + this.id + '-' + fileData.id + '"></label>');
@@ -693,6 +694,7 @@
options = options || {};
var type = fileData.type || 'file',
mime = fileData.mimetype,
+ path = fileData.path || this.getCurrentDirectory(),
permissions = parseInt(fileData.permissions, 10) || 0;
if (fileData.isShareMountPoint) {
@@ -729,7 +731,7 @@
// lazy load / newly inserted td ?
if (!fileData.icon) {
this.lazyLoadPreview({
- path: this.getCurrentDirectory() + '/' + fileData.name,
+ path: path + '/' + fileData.name,
mime: mime,
etag: fileData.etag,
callback: function(url) {
@@ -740,7 +742,7 @@
else {
// set the preview URL directly
var urlSpec = {
- file: this.getCurrentDirectory() + '/' + fileData.name,
+ file: path + '/' + fileData.name,
c: fileData.etag
};
var previewUrl = this.generatePreviewUrl(urlSpec);