[FEATURE] Don't deleted log entries but set deleted=1. New option for…

…ceDelete for BE module
vincentvialard · Mar 7, 2016 · 7f62065 · 7f62065
1 parent fa95dcc
commit 7f62065
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/Classes/Controller/ModuleController.php b/Classes/Controller/ModuleController.php
@@ -236,13 +236,22 @@ public function exportAction($logDataUids = NULL, array $fields, $filetype = '')
      */
     public function deleteLogRowsAction($logDataUids = NULL)
     {
+        $forceDelete = intval($this->settings['forceDelete']);
         if ($logDataUids === 'all') {
             $text = \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('message.deleted-all-logs', 'formhandler');
-            $GLOBALS['TYPO3_DB']->exec_TRUNCATEquery('tx_formhandler_log');
+            if ($forceDelete){
+                $GLOBALS['TYPO3_DB']->exec_TRUNCATEquery('tx_formhandler_log');
+            } else {
+                $GLOBALS['TYPO3_DB']->exec_UPDATEquery('tx_formhandler_log', '1=1', ['deleted' => 1]);
+            }
         } else {
             $logDataUids = explode(',', $logDataUids);
             $text = sprintf(\TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('message.deleted-log-rows', 'formhandler'), count($logDataUids));
-            $GLOBALS['TYPO3_DB']->exec_DELETEquery('tx_formhandler_log', 'uid IN (' . implode(',', $logDataUids) . ')');
+            if ($forceDelete){
+                $GLOBALS['TYPO3_DB']->exec_DELETEquery('tx_formhandler_log', 'uid IN (' . implode(',', $logDataUids) . ')');
+            } else {
+                $GLOBALS['TYPO3_DB']->exec_UPDATEquery('tx_formhandler_log', 'uid IN (' . implode(',', $logDataUids) . ')', ['deleted' => 1]);
+            }
         }
 
         $this->addFlashMessage($text);

diff --git a/Classes/Domain/Repository/LogDataRepository.php b/Classes/Domain/Repository/LogDataRepository.php
@@ -47,6 +47,7 @@ public function findByUids($uids)
         foreach ($uidArray as $key => $value) {
             $constraints[] = $query->equals('uid', $value);
         }
+        $constraints[] = $query->equals('deleted', 0);
         return $query->matching(
             $query->logicalAnd(
                 $query->logicalOr(
@@ -60,7 +61,7 @@ public function findDemanded(\Typoheads\Formhandler\Domain\Model\Demand $demand
     {
 
         $query = $this->createQuery();
-        $constraints = [];
+        $constraints = [$query->equals('deleted', 0)];
 
         if ($demand !== NULL) {
             if ($demand->getPid() > 0) {

diff --git a/Configuration/TCA/tx_formhandler_log.php b/Configuration/TCA/tx_formhandler_log.php
@@ -6,6 +6,7 @@
         'default_sortby' => 'ORDER BY crdate DESC',
         'crdate' => 'crdate',
         'tstamp' => 'tstamp',
+        'delete' => 'deleted',
         'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('formhandler') . 'ext_icon.gif',
         'adminOnly' => 1
     ],

diff --git a/ext_tables.sql b/ext_tables.sql
@@ -6,6 +6,7 @@ CREATE TABLE tx_formhandler_log (
 	pid int(11) unsigned DEFAULT '0' NOT NULL,
 	tstamp int(11) unsigned DEFAULT '0' NOT NULL,
 	crdate int(11) unsigned DEFAULT '0' NOT NULL,
+	deleted int(11) unsigned DEFAULT '0' NOT NULL,
 	ip tinytext,
 	params mediumtext,
 	is_spam int(11) unsigned DEFAULT '0',

diff --git a/ext_typoscript_setup.txt b/ext_typoscript_setup.txt
@@ -26,6 +26,7 @@ config.tx_extbase.persistence.classes {
 module.tx_formhandler {
 	view.widget.TYPO3\CMS\Fluid\ViewHelpers\Be\Widget\PaginateViewHelper.templateRootPath = EXT:formhandler/Resources/Private/Templates/
 	settings {
+	    forceDelete = 0
 		pdf {
 			class = Typoheads\Formhandler\Generator\BackendTcPdf
 			config {