From 5eaa4292c6db2c1ee1282c938c899dc5b88db65f Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 20 Apr 2020 11:49:17 +0200
Subject: [statistics] New filter UI

---
 modules-available/statistics/pages/list.inc.php | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'modules-available/statistics/pages/list.inc.php')

diff --git a/modules-available/statistics/pages/list.inc.php b/modules-available/statistics/pages/list.inc.php
index 4df60044..a709ab3d 100644
--- a/modules-available/statistics/pages/list.inc.php
+++ b/modules-available/statistics/pages/list.inc.php
@@ -13,7 +13,7 @@ class SubPage
 		$sortColumn = Request::any('sortColumn');
 		$sortDirection = Request::any('sortDirection');
 
-		$filters = StatisticsFilter::parseQuery(StatisticsFilter::getQuery());
+		$filters = StatisticsFilter::parseQuery();
 		$filterSet = new StatisticsFilterSet($filters);
 		$filterSet->setSort($sortColumn, $sortDirection);
 
@@ -21,9 +21,7 @@ class SubPage
 			Message::addError('main.no-permission');
 			Util::redirect('?do=main');
 		}
-		Render::openTag('div', array('class' => 'row'));
-		StatisticsFilter::renderFilterBox('list', $filterSet, StatisticsFilter::getQuery());
-		Render::closeTag('div');
+		StatisticsFilter::renderFilterBox('list', $filterSet);
 		self::showMachineList($filterSet);
 	}
 
@@ -119,11 +117,6 @@ class SubPage
 		$data = array(
 			'rowCount' => count($rows),
 			'rows' => $rows,
-			'query' => StatisticsFilter::getQuery(),
-			'delimiter' => StatisticsFilter::DELIMITER,
-			'sortDirection' => $filterSet->getSortDirection(),
-			'sortColumn' => $filterSet->getSortColumn(),
-			'columns' => json_encode(StatisticsFilter::$columns),
 			'showList' => 1,
 			'show' => 'list',
 			'redirect' => $_SERVER['QUERY_STRING'],
-- 
cgit v1.2.3-55-g7522