diff options
| -rw-r--r-- | apps/files/js/filelist.js | 2 | ||||
| -rw-r--r-- | apps/files_trashbin/index.php | 1 | ||||
| -rw-r--r-- | apps/files_trashbin/js/trash.js | 2 | ||||
| -rw-r--r-- | apps/files_trashbin/lib/trash.php | 2 | ||||
| -rw-r--r-- | apps/files_trashbin/templates/index.php | 9 | ||||
| -rw-r--r-- | core/img/actions/undelete.png | bin | 0 -> 680 bytes |
6 files changed, 8 insertions, 8 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 40d75aae932..5cb8849ffea 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -292,7 +292,7 @@ var FileList={ procesSelection(); } }); - }, + } }; $(document).ready(function(){ diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php index 20f9cb8daff..2e978ae190b 100644 --- a/apps/files_trashbin/index.php +++ b/apps/files_trashbin/index.php @@ -95,6 +95,7 @@ $list->assign('dirlisting', $dirlisting); $list->assign('disableDownloadActions', true); $tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage(), false); $tmpl->assign('fileList', $list->fetchPage(), false); +$tmpl->assign('files', $files); $tmpl->assign('dir', OC_Filesystem::normalizePath($view->getAbsolutePath())); $tmpl->printPage(); diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js index 92a431d495a..553e4cbc6f0 100644 --- a/apps/files_trashbin/js/trash.js +++ b/apps/files_trashbin/js/trash.js @@ -2,7 +2,7 @@ $(document).ready(function() { if (typeof FileActions !== 'undefined') { - FileActions.register('all', 'Undelete', OC.PERMISSION_READ, '', function(filename) { + FileActions.register('all', 'Undelete', OC.PERMISSION_READ, OC.imagePath('core', 'actions/undelete.png'), function(filename) { var tr=$('tr').filterAttr('data-file', filename); $.post(OC.filePath('files_trashbin','ajax','undelete.php'), {files:tr.attr('data-file'), dirlisting:tr.attr('data-dirlisting') }, diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index e81ba12758e..fad96e5222a 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -54,7 +54,7 @@ class Trashbin { self::copy_recursive($file_path, 'files_trashbin/'.$deleted.'.d'.$timestamp, $view); $query = \OC_DB::prepare("INSERT INTO *PREFIX*files_trash (id,timestamp,location,type,mime,user) VALUES (?,?,?,?,?,?)");
- $result = $query->execute(array($deleted, $timestamp, $location, $type, $mime, $user));
+ $query->execute(array($deleted, $timestamp, $location, $type, $mime, $user));
if ( \OCP\App::isEnabled('files_versions') ) {
if ( $view->is_dir('files_versions'.$file_path) ) {
diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php index a9cb216b1f7..ebabec2d4d0 100644 --- a/apps/files_trashbin/templates/index.php +++ b/apps/files_trashbin/templates/index.php @@ -5,8 +5,8 @@ </div> <div id='notification'></div> -<?php if (isset($_['files']) and $_['isCreatable'] and count($_['files'])==0):?> - <div id="emptyfolder"><?php echo $l->t('Nothing in here. Upload something!')?></div> +<?php if (isset($_['files']) && count($_['files'])==0):?> + <div id="emptyfolder"><?php echo $l->t('Nothing in here. Trash bin empty!')?></div> <?php endif; ?> <table> @@ -17,9 +17,8 @@ <span class='name'><?php echo $l->t( 'Name' ); ?></span> <span class='selectedActions'> <a href="" class="undelete"> - <!-- <img class="svg" alt="Undelete" - src="<?php echo OCP\image_path("core", "actions/download.svg"); ?>" /> - --> + <img class="svg" alt="Undelete" + src="<?php echo OCP\image_path("core", "actions/undelete.png"); ?>" /> <?php echo $l->t('Undelete')?> </a> </span> diff --git a/core/img/actions/undelete.png b/core/img/actions/undelete.png Binary files differnew file mode 100644 index 00000000000..9f728252394 --- /dev/null +++ b/core/img/actions/undelete.png |
