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

Merge pull request #3223 from owncloud/fix-2820 

if rename of file fails, the rename is undone in the view - fix 2820
This commit is contained in:
Morris Jobke 2013-07-01 01:28:17 -07:00
parent 80a8b9c995 e0547a25ab
commit b19033b353
4 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
apps/files/js/filelist.js
View File

@ -220,13 +220,44 @@ var FileList={
if (FileList.checkName(name, newname, false)) {
newname = name;
} else {
$.get(OC.filePath('files','ajax','rename.php'), { dir : $('#dir').val(), newname: newname, file: name },function(result) {
if (!result || result.status == 'error') {
OC.dialogs.alert(result.data.message, 'Error moving file');
newname = name;
// save background image, because it's replaced by a spinner while async request
var oldBackgroundImage = td.css('background-image');
// mark as loading
td.css('background-image', 'url('+ OC.imagePath('core', 'loading.gif') + ')');
$.ajax({
url: OC.filePath('files','ajax','rename.php'),
data: {
dir : $('#dir').val(),
newname: newname,
file: name
},
success: function(result) {
if (!result || result.status === 'error') {
OC.Notification.show(result.data.message);
newname = name;
// revert changes
tr.attr('data-file', newname);
var path = td.children('a.name').attr('href');
td.children('a.name').attr('href', path.replace(encodeURIComponent(name), encodeURIComponent(newname)));
if (newname.indexOf('.') > 0 && tr.data('type') !== 'dir') {
var basename=newname.substr(0,newname.lastIndexOf('.'));
} else {
var basename=newname;
}
td.find('a.name span.nametext').text(basename);
if (newname.indexOf('.') > 0 && tr.data('type') !== 'dir') {
if (td.find('a.name span.extension').length === 0 ) {
td.find('a.name span.nametext').append('<span class="extension"></span>');
}
td.find('a.name span.extension').text(newname.substr(newname.lastIndexOf('.')));
}
tr.find('.fileactions').effect('highlight', {}, 5000);
tr.effect('highlight', {}, 5000);
}
// remove loading mark and recover old image
td.css('background-image', oldBackgroundImage);
}
});
}
}
tr.data('renaming',false);

2
apps/files/lib/app.php
View File

@ -70,7 +70,7 @@ class App {
} else {
// rename failed
$result['data'] = array(
'message' => $this->l10n->t('Unable to rename file')
'message' => $this->l10n->t('%s could not be renamed', array($oldname))
);
}
return $result;

2
apps/files/tests/ajax_rename.php
View File

@ -50,7 +50,7 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
$result = $this->files->rename($dir, $oldname, $newname);
$expected = array(
'success' => false,
'data' => array('message' => 'Unable to rename file')
'data' => array('message' => '%s could not be renamed')
);
$this->assertEquals($expected, $result);

4
core/js/js.js
View File

@ -352,10 +352,10 @@ OC.Notification={
},
show: function(text) {
if(($('#notification').filter('span.undo').length == 1) || OC.Notification.isHidden()){
$('#notification').html(text);
$('#notification').text(text);
$('#notification').fadeIn().css("display","inline");
}else{
OC.Notification.queuedNotifications.push($(text).html());
OC.Notification.queuedNotifications.push($('<div/>').text(text).html());
}
},
isHidden: function() {