wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix issue when renaming creates a separate entry

Browse source
This commit is contained in:
Vincent Petry 2015-11-19 11:42:17 +01:00 committed by Lukas Reschke
parent ec3166742b
commit d3383adb71
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/files/js/filelist.js
View file

@ -1806,10 +1806,8 @@
}
function updateInList(fileInfo) {
tr.remove();
tr = self.add(fileInfo, {updateSummary: false, silent: true});
self.$fileList.trigger($.Event('fileActionsReady', {fileList: self, $files: $(tr)}));
self._updateDetailsView(fileInfo.name);
self.updateRow(tr, fileInfo);
self._updateDetailsView(fileInfo.name, false);
}
// TODO: too many nested blocks, move parts into functions
@ -1838,11 +1836,10 @@
td.children('a.name').show();
var path = tr.attr('data-path') || self.getCurrentDirectory();
self.filesClient.move(path + '/' + oldName, path + '/' + newName)
self.filesClient.move(OC.joinPaths(path, oldName), OC.joinPaths(path, newName))
.done(function() {
var fileInfo = self.files.splice(tr.index(), 1)[0];
fileInfo.name = newName;
updateInList(fileInfo);
oldFileInfo.name = newName;
updateInList(oldFileInfo);
})
.fail(function(status) {
// TODO: 409 means current folder does not exist, redirect ?