mirror of
https://github.com/Icinga/icingaweb2-module-director.git
synced 2025-07-29 08:44:11 +02:00
parent
26a4a10536
commit
8e4ebb79d7
@ -16,6 +16,7 @@ This version hasn't been released yet
|
|||||||
* FEATURE: Deployment Log now breaks lines (#2677)
|
* FEATURE: Deployment Log now breaks lines (#2677)
|
||||||
* FEATURE: Sort Template trees by name (#2691)
|
* FEATURE: Sort Template trees by name (#2691)
|
||||||
* FEATURE: Branch and Sync diff/preview now shows related host for services (#2736)
|
* FEATURE: Branch and Sync diff/preview now shows related host for services (#2736)
|
||||||
|
* FEATURE: Show more details for assign filter parsing errors (#2667)
|
||||||
* FIX: do not fail for (some) Service Dependencies (#2669, #1142)
|
* FIX: do not fail for (some) Service Dependencies (#2669, #1142)
|
||||||
* FIX: Service Sets can now be searched by Service name in branches too (#2738)
|
* FIX: Service Sets can now be searched by Service name in branches too (#2738)
|
||||||
|
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace Icinga\Module\Director\IcingaConfig;
|
namespace Icinga\Module\Director\IcingaConfig;
|
||||||
|
|
||||||
|
use gipfl\Json\JsonDecodeException;
|
||||||
use gipfl\Json\JsonString;
|
use gipfl\Json\JsonString;
|
||||||
use Icinga\Data\Filter\Filter;
|
use Icinga\Data\Filter\Filter;
|
||||||
use Icinga\Data\Filter\FilterAnd;
|
use Icinga\Data\Filter\FilterAnd;
|
||||||
@ -128,8 +129,14 @@ class AssignRenderer
|
|||||||
}
|
}
|
||||||
|
|
||||||
$column = $filter->getColumn();
|
$column = $filter->getColumn();
|
||||||
$rawExpression = Json::decode($filter->getExpression());
|
try {
|
||||||
$expression = $this->renderExpressionValue($rawExpression);
|
$rawExpression = JsonString::decode($filter->getExpression());
|
||||||
|
$expression = $this->renderExpressionValue($rawExpression);
|
||||||
|
} catch (JsonDecodeException $e) {
|
||||||
|
throw new InvalidArgumentException(
|
||||||
|
"Got invalid JSON in filter string: $column" . $filter->getSign() . $filter->getExpression()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
if (is_array($rawExpression) && $filter instanceof FilterMatch) {
|
if (is_array($rawExpression) && $filter instanceof FilterMatch) {
|
||||||
return $this->renderInArray($column, $expression);
|
return $this->renderInArray($column, $expression);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user