add timestamp to function call; fix trash.js to handle multiple delete operation at once

remotes/origin/stable5
Björn Schießle 12 years ago
parent 7bfbfe6562
commit 211e651d72
  1. 2
      apps/files_trashbin/ajax/delete.php
  2. 8
      apps/files_trashbin/js/trash.js

@ -26,7 +26,7 @@ foreach ($list as $file) {
} }
OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp); 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]['filename'] = $file;
$success[$i]['timestamp'] = $timestamp; $success[$i]['timestamp'] = $timestamp;
$i++; $i++;

@ -36,11 +36,11 @@ $(document).ready(function() {
$.post(OC.filePath('files_trashbin','ajax','delete.php'), $.post(OC.filePath('files_trashbin','ajax','delete.php'),
{files:tr.attr('data-file'), dirlisting:tr.attr('data-dirlisting') }, {files:tr.attr('data-file'), dirlisting:tr.attr('data-dirlisting') },
function(result){ function(result){
if ( result.status == 'success' ) { for (var i = 0; i < result.data.success.length; i++) {
var row = document.getElementById(result.data.filename); var row = document.getElementById(result.data.success[i].filename);
row.parentNode.removeChild(row); row.parentNode.removeChild(row);
} else { }
deleteAction[0].outerHTML = oldHTML; if (result.status != 'success') {
OC.dialogs.alert(result.data.message, 'Error'); OC.dialogs.alert(result.data.message, 'Error');
} }
}); });

Loading…
Cancel
Save