diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2019-01-31 17:11:44 +0100 |
|---|---|---|
| committer | Backportbot <backportbot-noreply@rullzer.com> | 2019-02-05 14:12:08 +0000 |
| commit | 5ffb793b71996d2e70b99c8a7420d2e8f89016a6 (patch) | |
| tree | 3ce42c1e017eec9df199e00624318019bff5e064 | |
| parent | d629b5afdc815e03d9ed0d9bdffbc215553e0507 (diff) | |
| download | nextcloud-server-5ffb793b71996d2e70b99c8a7420d2e8f89016a6.tar.gz nextcloud-server-5ffb793b71996d2e70b99c8a7420d2e8f89016a6.zip | |
Show original path in trashbin via extraData
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| -rw-r--r-- | apps/files_trashbin/js/filelist.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/apps/files_trashbin/js/filelist.js b/apps/files_trashbin/js/filelist.js index 3159506fae9..07e041faefd 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()); }, /** |