From 608571df6d8696ce3fce792448d4a213f6b4d3cc Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 5 May 2020 16:13:24 +0200
Subject: [statistics] Re-introduce "with sublocations" for location filter

---
 modules-available/statistics/inc/statisticsfilter.inc.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules-available/statistics/inc/statisticsfilter.inc.php b/modules-available/statistics/inc/statisticsfilter.inc.php
index 83983ee1..a038f076 100644
--- a/modules-available/statistics/inc/statisticsfilter.inc.php
+++ b/modules-available/statistics/inc/statisticsfilter.inc.php
@@ -23,6 +23,7 @@ abstract class StatisticsFilter
 	const OP_ORDINAL = ['=', '!=', '<', '>', '<=', '>='];
 	const OP_STRCMP = ['~', '!~', '=', '!='];
 	const OP_NOMINAL = ['=', '!='];
+	const OP_LOCATIONS = ['=', '!=', '~'];
 	const OP_FUZZY_ORDINAL = ['=', '!=', '~', '!~', '<', '>', '<=', '>='];
 
 	/**
@@ -281,9 +282,9 @@ class EnumStatisticsFilter extends SimpleStatisticsFilter
 
 	public $values;
 
-	public function __construct(string $column, array $values)
+	public function __construct(string $column, array $values, array $ops = self::OP_NOMINAL)
 	{
-		parent::__construct($column, self::OP_NOMINAL, '');
+		parent::__construct($column, $ops, '');
 		if (isset($values[0])) {
 			if (!is_array($values[0])) {
 				$values = array_map(function($e) { return [
@@ -489,7 +490,7 @@ class LocationStatisticsFilter extends EnumStatisticsFilter
 				'value' => $loc['locationpad'] . ' ' . $loc['locationname'],
 			];
 		}
-		parent::__construct('locationid', $locs);
+		parent::__construct('locationid', $locs, self::OP_LOCATIONS);
 
 	}
 
-- 
cgit v1.2.3-55-g7522