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

Merge pull request #8931 from owncloud/filelist-usepathforaction

Browse source 
[master] Use actual file path on rename/delete
This commit is contained in:
Vincent Petry 2014-06-23 15:53:23 +02:00
commit 6850d0c6d7
4 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files/js/fileactions.js
View file

@ -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();
});

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

@ -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
},

3
apps/files/tests/js/fileactionsSpec.js
View file

@ -140,6 +140,7 @@ describe('OCA.Files.FileActions tests', function() {
id: 18,
type: 'file',
name: 'testName.txt',
path: '/somepath/dir',
mimetype: 'text/plain',
size: '1234',
etag: 'a01234c',
@ -151,6 +152,8 @@ describe('OCA.Files.FileActions tests', function() {
$tr.find('.action.delete').click();
expect(deleteStub.calledOnce).toEqual(true);
expect(deleteStub.getCall(0).args[0]).toEqual('testName.txt');
expect(deleteStub.getCall(0).args[1]).toEqual('/somepath/dir');
deleteStub.restore();
});
it('passes context to action handler', function() {

6
apps/files/tests/js/filelistSpec.js
View file

@ -485,7 +485,9 @@ describe('OCA.Files.FileList tests', function() {
var $input, request;
for (var i = 0; i < testFiles.length; i++) {
fileList.add(testFiles[i], {silent: true});
var file = testFiles[i];
file.path = '/some/subdir';
fileList.add(file, {silent: true});
}
// trigger rename prompt
@ -498,7 +500,7 @@ describe('OCA.Files.FileList tests', function() {
expect(fakeServer.requests.length).toEqual(1);
request = fakeServer.requests[0];
expect(request.url.substr(0, request.url.indexOf('?'))).toEqual(OC.webroot + '/index.php/apps/files/ajax/rename.php');
expect(OC.parseQueryString(request.url)).toEqual({'dir': '/subdir', newname: 'Tu_after_three.txt', file: 'One.txt'});
expect(OC.parseQueryString(request.url)).toEqual({'dir': '/some/subdir', newname: 'Tu_after_three.txt', file: 'One.txt'});
}
it('Inserts renamed file entry at correct position if rename ajax call suceeded', function() {
doRename();