From 979cf79555ca06ac3a31cad027d76bc20424b36b Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Thu, 31 Jan 2019 17:11:44 +0100 Subject: [PATCH] Show original path in trashbin via extraData Signed-off-by: Morris Jobke Signed-off-by: Roeland Jago Douma --- apps/files_trashbin/js/filelist.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/files_trashbin/js/filelist.js b/apps/files_trashbin/js/filelist.js index 3159506fae..07e041faef 100644 --- a/apps/files_trashbin/js/filelist.js +++ b/apps/files_trashbin/js/filelist.js @@ -11,6 +11,7 @@ var DELETED_REGEXP = new RegExp(/^(.+)\.d[0-9]+$/); var FILENAME_PROP = '{http://nextcloud.org/ns}trashbin-filename'; var DELETION_TIME_PROP = '{http://nextcloud.org/ns}trashbin-deletion-time'; + var TRASHBIN_ORIGINAL_LOCATION = '{http://nextcloud.org/ns}trashbin-original-location'; /** * Convert a file name in the format filename.d12345 to the real file name. @@ -54,11 +55,13 @@ initialize: function() { this.client.addFileInfoParser(function(response, data) { var props = response.propStat[0].properties; + var path = props[TRASHBIN_ORIGINAL_LOCATION]; return { displayName: props[FILENAME_PROP], mtime: parseInt(props[DELETION_TIME_PROP], 10) * 1000, hasPreview: true, - path: data.path.substr(6), // remove leading /trash + path: path, + extraData: path } }); @@ -248,7 +251,7 @@ * Returns list of webdav properties to request */ _getWebdavProperties: function() { - return [FILENAME_PROP, DELETION_TIME_PROP].concat(this.filesClient.getPropfindProperties()); + return [FILENAME_PROP, DELETION_TIME_PROP, TRASHBIN_ORIGINAL_LOCATION].concat(this.filesClient.getPropfindProperties()); }, /**