[FEATURE] Add selector for items per page in module

zoranilic · Jun 1, 2016 · 52fce55 · 52fce55
1 parent bd0f35f
commit 52fce55
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/Classes/Controller/ModuleController.php b/Classes/Controller/ModuleController.php
@@ -100,10 +100,15 @@ public function indexAction(\Typoheads\Formhandler\Domain\Model\Demand $demand =
                 $demand->setPid($this->id);
             }
         }
+
         $logDataRows = $this->logDataRepository->findDemanded($demand);
         $this->view->assign('demand', $demand);
         $this->view->assign('logDataRows', $logDataRows);
         $this->view->assign('settings', $this->settings);
+        if(!$this->gp['show']) {
+            $this->gp['show'] = 10;
+        }
+        $this->view->assign('showItems', $this->gp['show']);
         $permissions = [];
         if ($GLOBALS['BE_USER']->user['admin'] || intval($this->settings['enableClearLogs']) === 1) {
             $permissions['delete'] = TRUE;

diff --git a/Classes/ViewHelpers/Widget/UriViewHelper.php b/Classes/ViewHelpers/Widget/UriViewHelper.php
@@ -39,10 +39,12 @@ protected function getWidgetUri()
         }
 
         $queryParameters = [$argumentPrefix => $arguments];
+
         //@TODO: HOW TO DO THIS BETTER?
         $additionalParams = [
-            'tx_formhandler_web_formhandlertxformhandler' => [
-                'demand' => $_POST['tx_formhandler_web_formhandlertxformhandler']['demand']
+            'tx_formhandler_web_formhandlerlog' => [
+                'demand' => $_POST['tx_formhandler_web_formhandlerlog']['demand'],
+                'show' => $_POST['tx_formhandler_web_formhandlerlog']['show']
             ]
         ];
         $queryParameters = array_merge($queryParameters, $additionalParams);

diff --git a/Resources/Private/Language/locallang.xml b/Resources/Private/Language/locallang.xml
@@ -15,6 +15,7 @@
 			<label index="label.ip">IP</label>
 			<label index="label.detailView">View</label>
 			<label index="label.export">Export as</label>
+			<label index="label.show">Items per page</label>
 			<label index="label.submit">Filter</label>
 			<label index="label.select-all">Select all pages</label>
 			<label index="label.select-page-from-tree">Please select the page using the page tree.</label>

diff --git a/Resources/Private/Templates/Module/Index.html b/Resources/Private/Templates/Module/Index.html
@@ -53,7 +53,10 @@ <h1><f:translate key="headline.index" /></h1>
 							</span>
 						</div>
 					</div>
-
+					<div class="form-group">
+						<label for="tx_formhandler_logdata_show"><f:translate key="label.show" /></label>
+						<f:form.select id="tx_formhandler_logdata_show" class="form-control" name="show" value="{showItems}" options="{10:10, 50:50, 100:100, 1000:1000, 999999:'All'}"/>
+					</div>
 					<div class="form-group">
 						<f:form.submit value="{f:translate(key: 'label.submit')}" class="btn btn-default btn-sm" />
 					</div>
@@ -63,7 +66,7 @@ <h1><f:translate key="headline.index" /></h1>
 				<div class="col-xs-12">
 					<f:if condition="{logDataRows -> f:count()} > 0">
 						<f:then>
-							<f:be.widget.paginate objects="{logDataRows}" as="paginatedLogDataRows" configuration="{itemsPerPage: 5, insertBelow: 1}">
+							<f:be.widget.paginate objects="{logDataRows}" as="paginatedLogDataRows" configuration="{itemsPerPage: showItems, insertBelow: 1}">
 								<div class="table-fit">
 									<table class="table table-striped table-hover">
 										<thead>