summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2014-09-16 12:49:17 +0200
committerMorris Jobke <hey@morrisjobke.de>2014-09-16 12:49:17 +0200
commit61b040cbe89d010a586fcd95ff8a65e40e4f0f44 (patch)
tree38397bab74f85d65d2f641ea95f2aa50794884ac /apps/files_sharing
parente2b504e61d3c6b1c6684b0c06a37d45215d5f571 (diff)
parentea2022661d85092b30f49056c3523501b6cb7e54 (diff)
downloadnextcloud-server-61b040cbe89d010a586fcd95ff8a65e40e4f0f44.tar.gz
nextcloud-server-61b040cbe89d010a586fcd95ff8a65e40e4f0f44.zip
Merge pull request #10663 from owncloud/files_trashbin_original_path
Show original path information in trashbin and for shares
Diffstat (limited to 'apps/files_sharing')
-rw-r--r--apps/files_sharing/js/sharedfilelist.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/apps/files_sharing/js/sharedfilelist.js b/apps/files_sharing/js/sharedfilelist.js
index d29285dc1de..b99611f9bf0 100644
--- a/apps/files_sharing/js/sharedfilelist.js
+++ b/apps/files_sharing/js/sharedfilelist.js
@@ -181,6 +181,9 @@
file.name = OC.basename(share.file_target);
file.path = OC.dirname(share.file_target);
file.permissions = share.permissions;
+ if (file.path) {
+ file.extraData = share.file_target;
+ }
}
else {
if (share.share_type !== OC.Share.SHARE_TYPE_LINK) {
@@ -189,6 +192,9 @@
file.name = OC.basename(share.path);
file.path = OC.dirname(share.path);
file.permissions = OC.PERMISSION_ALL;
+ if (file.path) {
+ file.extraData = share.path;
+ }
}
return file;
})