diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-06-23 15:53:23 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-06-23 15:53:23 +0200 |
| commit | 6850d0c6d72e2bb1837e2ee76a4da3e2b8e6509f (patch) | |
| tree | 79871e8abde4d6e5a0873079f6cb9b960e5e0f7e /apps/files/js | |
| parent | 8c8209828126a55b9bf775e00cbc14d7ef7db5ae (diff) | |
| parent | d3d0035a9a81ea5d3e314141069f4914e3c6ce54 (diff) | |
| download | nextcloud-server-6850d0c6d72e2bb1837e2ee76a4da3e2b8e6509f.tar.gz nextcloud-server-6850d0c6d72e2bb1837e2ee76a4da3e2b8e6509f.zip | |
Merge pull request #8931 from owncloud/filelist-usepathforaction
[master] Use actual file path on rename/delete
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/fileactions.js | 2 | ||||
| -rw-r--r-- | apps/files/js/filelist.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 5bd75ac6287..47a6ab2f04b 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -257,7 +257,7 @@ this.register('all', 'Delete', OC.PERMISSION_DELETE, function () { return OC.imagePath('core', 'actions/delete'); }, function (filename, context) { - context.fileList.do_delete(filename); + context.fileList.do_delete(filename, context.dir); $('.tipsy').remove(); }); diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index fb97b2f4595..d5e16f9e20e 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -1219,7 +1219,7 @@ $.ajax({ url: OC.filePath('files','ajax','rename.php'), data: { - dir : self.getCurrentDirectory(), + dir : tr.attr('data-path') || self.getCurrentDirectory(), newname: newName, file: oldname }, |