wip

stepapo · Jan 14, 2025 · 1945111 · 1945111
1 parent bc0928d
commit 1945111
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/src/Control/Dataset/DatasetControl.php b/src/Control/Dataset/DatasetControl.php
@@ -229,10 +229,7 @@ private function filter(ICollection $c): ICollection
 			}
 			$this->activeFilter = true;
 			if ($column->filter->type === 'single') {
-				if (!isset($column->filter->options[$value])) {
-					continue;
-				}
-				if ($column->filter->options[$value] instanceof Option && $column->filter->options[$value]->condition) {
+				if (isset($column->filter->options[$value]) && $column->filter->options[$value] instanceof Option && $column->filter->options[$value]->condition) {
 					$c = $c->findBy($column->filter->options[$value]->condition);
 				} elseif ($column->filter->function) {
 					if (is_array($column->filter->columnName)) {
@@ -260,10 +257,7 @@ private function filter(ICollection $c): ICollection
 				if ($column->filter->multiMode === 'any') {
 					$filter = [ICollection::OR];
 					foreach ($value as $v) {
-						if (!isset($column->filter->options[$v])) {
-							continue;
-						}
-						if ($column->filter->options[$v] instanceof Option && $column->filter->options[$v]->condition) {
+						if (isset($column->filter->options[$v]) && $column->filter->options[$v] instanceof Option && $column->filter->options[$v]->condition) {
 							$filter[] = $column->filter->options[$v]->condition;
 						} elseif ($column->filter->function) {
 							$filter[] = [$column->filter->function, Helper::getNextrasName($column->filter->columnName), $v];