From c2b328c69f2c7b5c2e32a6fdfa19ed7d3fb738bd Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Tue, 13 Feb 2018 13:52:45 +0100
Subject: [PATCH] FilterWidget: if "is set" is chosen in the operation
 dropdown, then the operation value field and the option field will be hidden

---
 application/views/widgets/filter/filter.php |  4 ++++
 application/widgets/FilterWidget.php        | 12 ++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/application/views/widgets/filter/filter.php b/application/views/widgets/filter/filter.php
index fdcd2d343..c6df10073 100644
--- a/application/views/widgets/filter/filter.php
+++ b/application/views/widgets/filter/filter.php
@@ -4,6 +4,10 @@
 		margin: 0 10px 10px 10px;
 	}
 
+	.hidden-control {
+		display: none !important;
+	}
+
 </style>
 <script language="Javascript" type="text/javascript">
 	$(document).ready(function() {
diff --git a/application/widgets/FilterWidget.php b/application/widgets/FilterWidget.php
index db519686d..41f55d1df 100644
--- a/application/widgets/FilterWidget.php
+++ b/application/widgets/FilterWidget.php
@@ -323,6 +323,14 @@ class FilterWidget extends Widget
 		}
 		elseif ($filterMetaData->type == 'timestamp')
 		{
+			$classOperation = 'select-filter-operation-value';
+			$classOption = 'select-filter-option';
+			if ($activeFilterOperationValue == self::OP_SET)
+			{
+				$classOperation .= ' hidden-control';
+				$classOption .= ' hidden-control';
+			}
+
 			$html = '
 				<span>
 					<select name="%s" class="select-filter-operation">
@@ -333,9 +341,9 @@ class FilterWidget extends Widget
 					</select>
 				</span>
 				<span>
-					<input type="text" name="%s" value="%s" class="select-filter-operation-value">
+					<input type="text" name="%s" value="%s" class="'.$classOperation.'">
 				</span>
-				<select name="%s" class="select-filter-option">
+				<select name="%s" class="'.$classOption.'">
 					<option value="'.self::OPT_DAYS.'" '.($activeFilterOptionValue == self::OPT_DAYS ? 'selected' : '').'>Days</option>
 					<option value="'.self::OPT_MONTHS.'" '.($activeFilterOptionValue == self::OPT_MONTHS ? 'selected' : '').'>Months</option>
 				</select>