From 3a2c9544d0f614fe2befa841f6c8b8e68f5c1f67 Mon Sep 17 00:00:00 2001
From: Andreas Fernandez <a.fernandez@scripting-base.de>
Date: Fri, 6 Feb 2015 15:56:04 +0100
Subject: [PATCH] [BUGFIX] Recycler counts deleted records correctly
This patch improves the usability and fixes a small bug:
- Add the clearable to the search form
- Count deleted records correctly
Resolves: #64911
Releases: master
Change-Id: I0fc702697ce1c630d39f6b127f605c9d8aa5afb4
Reviewed-on: http://review.typo3.org/36716
Reviewed-by: Mathias Schreiber <mathias.schreiber@wmdb.de>
Tested-by: Mathias Schreiber <mathias.schreiber@wmdb.de>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
---
.../Classes/Controller/RecyclerAjaxController.php | 2 +-
.../recycler/Resources/Public/JavaScript/Recycler.js | 11 +++++++++--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/typo3/sysext/recycler/Classes/Controller/RecyclerAjaxController.php b/typo3/sysext/recycler/Classes/Controller/RecyclerAjaxController.php
index fb8aacf14923..aee0c42647b2 100644
--- a/typo3/sysext/recycler/Classes/Controller/RecyclerAjaxController.php
+++ b/typo3/sysext/recycler/Classes/Controller/RecyclerAjaxController.php
@@ -87,7 +87,7 @@ class RecyclerAjaxController {
$deletedRowsArray = $model->getDeletedRows();
$model = GeneralUtility::makeInstance(DeletedRecords::class);
- $totalDeleted = $model->getTotalCount($this->conf['startUid'], $this->conf['table'], $this->conf['depth'], $this->conf['filter']);
+ $totalDeleted = $model->getTotalCount($this->conf['startUid'], $this->conf['table'], $this->conf['depth'], $this->conf['filterTxt']);
/* @var $controller DeletedRecordsController */
$controller = GeneralUtility::makeInstance(DeletedRecordsController::class);
diff --git a/typo3/sysext/recycler/Resources/Public/JavaScript/Recycler.js b/typo3/sysext/recycler/Resources/Public/JavaScript/Recycler.js
index c2fb5601b4b7..742ac6cc2302 100644
--- a/typo3/sysext/recycler/Resources/Public/JavaScript/Recycler.js
+++ b/typo3/sysext/recycler/Resources/Public/JavaScript/Recycler.js
@@ -14,7 +14,7 @@
/**
* RequireJS module for Recycler
*/
-define(['jquery', 'nprogress'], function($, NProgress) {
+define(['jquery', 'nprogress', 'jquery/jquery.clearable'], function($, NProgress) {
var Recycler = {
identifiers: {
searchForm: '#recycler-form',
@@ -79,7 +79,14 @@ define(['jquery', 'nprogress'], function($, NProgress) {
Recycler.elements.$searchSubmitBtn.addClass('disabled');
Recycler.loadDeletedElements();
}
- });
+ }).clearable(
+ {
+ onClear: function() {
+ Recycler.elements.$searchSubmitBtn.addClass('disabled');
+ Recycler.loadDeletedElements();
+ }
+ }
+ );
// changing "depth"
Recycler.elements.$depthSelector.on('change', function() {
--
GitLab