diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-02-19 12:38:00 +0100 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-02-19 12:38:00 +0100 |
| commit | 211e651d7222085b528cc6e9dc8d060d8ea6a60e (patch) | |
| tree | d61ad68a0ab2d34c9a785b9dbce93596153d4cfe | |
| parent | 7bfbfe6562a7dbcecdc05b60214a0da83760c4a3 (diff) | |
| download | nextcloud-server-211e651d7222085b528cc6e9dc8d060d8ea6a60e.tar.gz nextcloud-server-211e651d7222085b528cc6e9dc8d060d8ea6a60e.zip | |
add timestamp to function call; fix trash.js to handle multiple delete operation at once
| -rw-r--r-- | apps/files_trashbin/ajax/delete.php | 2 | ||||
| -rw-r--r-- | apps/files_trashbin/js/trash.js | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php index 7684d0465e6..915ad9379f6 100644 --- a/apps/files_trashbin/ajax/delete.php +++ b/apps/files_trashbin/ajax/delete.php @@ -26,7 +26,7 @@ foreach ($list as $file) { } OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp); - if (!OCA\Files_Trashbin\Trashbin::file_exists($filename)) { + if (!OCA\Files_Trashbin\Trashbin::file_exists($filename, $timestamp)) { $success[$i]['filename'] = $file; $success[$i]['timestamp'] = $timestamp; $i++; diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js index 1dfe09feca0..fc38889dc37 100644 --- a/apps/files_trashbin/js/trash.js +++ b/apps/files_trashbin/js/trash.js @@ -36,11 +36,11 @@ $(document).ready(function() { $.post(OC.filePath('files_trashbin','ajax','delete.php'), {files:tr.attr('data-file'), dirlisting:tr.attr('data-dirlisting') }, function(result){ - if ( result.status == 'success' ) { - var row = document.getElementById(result.data.filename); + for (var i = 0; i < result.data.success.length; i++) { + var row = document.getElementById(result.data.success[i].filename); row.parentNode.removeChild(row); - } else { - deleteAction[0].outerHTML = oldHTML; + } + if (result.status != 'success') { OC.dialogs.alert(result.data.message, 'Error'); } }); |