mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13954 from nextcloud/bugfix/noid/show-original-location-in-trashbin 

Show original path in trashbin
This commit is contained in:
Roeland Jago Douma 2019-02-05 14:08:37 +01:00 committed by GitHub
parent 3d33703ed9 979cf79555
commit dbd0bd6b3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/files_trashbin/js/filelist.js
View File

@ -11,6 +11,7 @@
var DELETED_REGEXP = new RegExp(/^(.+)\.d[0-9]+$/); var DELETED_REGEXP = new RegExp(/^(.+)\.d[0-9]+$/);
var FILENAME_PROP = '{http://nextcloud.org/ns}trashbin-filename'; var FILENAME_PROP = '{http://nextcloud.org/ns}trashbin-filename';
var DELETION_TIME_PROP = '{http://nextcloud.org/ns}trashbin-deletion-time'; 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. * Convert a file name in the format filename.d12345 to the real file name.
@ -54,11 +55,13 @@
initialize: function() { initialize: function() {
this.client.addFileInfoParser(function(response, data) { this.client.addFileInfoParser(function(response, data) {
var props = response.propStat[0].properties; var props = response.propStat[0].properties;
var path = props[TRASHBIN_ORIGINAL_LOCATION];
return { return {
displayName: props[FILENAME_PROP], displayName: props[FILENAME_PROP],
mtime: parseInt(props[DELETION_TIME_PROP], 10) * 1000, mtime: parseInt(props[DELETION_TIME_PROP], 10) * 1000,
hasPreview: true, 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 * Returns list of webdav properties to request
*/ */
_getWebdavProperties: function() { _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());
}, },
/** /**