diff options
| author | Vladimirs Maksimovs <vladimirs.maksimovs@zabbix.com> | 2020-09-28 08:32:07 +0300 |
|---|---|---|
| committer | Vladimirs Maksimovs <vladimirs.maksimovs@zabbix.com> | 2020-09-28 08:32:07 +0300 |
| commit | 0aeb0f05851062cb6a8cff73cd729771ffbaa455 (patch) | |
| tree | 2e7611f9353a6b57af28ec11954875aa4315530a | |
| parent | c914557dccf3e77f91d2f90e8a9de69120467bcd (diff) | |
..F....... [ZBXNEXT-6141] removed unnecessary parameters for trendcount function validation
| -rw-r--r-- | ui/app/controllers/CControllerPopupTriggerExpr.php | 26 | ||||
| -rw-r--r-- | ui/include/classes/validators/CFunctionValidator.php | 2 |
2 files changed, 1 insertions, 27 deletions
diff --git a/ui/app/controllers/CControllerPopupTriggerExpr.php b/ui/app/controllers/CControllerPopupTriggerExpr.php index 3eb84d98442..d0a89985e53 100644 --- a/ui/app/controllers/CControllerPopupTriggerExpr.php +++ b/ui/app/controllers/CControllerPopupTriggerExpr.php @@ -28,7 +28,6 @@ class CControllerPopupTriggerExpr extends CController { private $param2SecCount = []; private $param2SecMode = []; private $param3SecVal = []; - private $param3SecPeriod = []; private $param3SecPercent = []; private $paramSecIntCount = []; private $paramForecast = []; @@ -149,29 +148,6 @@ class CControllerPopupTriggerExpr extends CController { ] ]; - $this->param3SecPeriod = [ - 'last' => [ - 'C' => _('Last of').' (T)', - 'T' => T_ZBX_INT, - 'A' => true - ], - 'v' => [ - 'C' => 'V', - 'T' => T_ZBX_STR, - 'A' => false - ], - 'o' => [ - 'C' => 'O', - 'T' => T_ZBX_STR, - 'A' => false - ], - 'period_shift' => [ - 'C' => _('Period shift'), - 'T' => T_ZBX_INT, - 'A' => true - ] - ]; - $this->param3SecPercent = [ 'last' => [ 'C' => _('Last of').' (T)', @@ -463,7 +439,7 @@ class CControllerPopupTriggerExpr extends CController { ], 'trendcount' => [ 'description' => _('trendcount() - Number of successfully retrieved values V (which fulfill operator O) for period T with exact period shift'), - 'params' => $this->param3SecPeriod, + 'params' => $this->param1Period, 'allowed_types' => $this->allowedTypesAny, 'operators' => ['=', '<>', '>', '<', '>=', '<='] ], diff --git a/ui/include/classes/validators/CFunctionValidator.php b/ui/include/classes/validators/CFunctionValidator.php index 9e37bf55ebf..6b2b44d87b9 100644 --- a/ui/include/classes/validators/CFunctionValidator.php +++ b/ui/include/classes/validators/CFunctionValidator.php @@ -277,8 +277,6 @@ class CFunctionValidator extends CValidator { 'trendcount' => [ 'args' => [ ['type' => 'period', 'mandat' => true], - ['type' => 'str'], - ['type' => 'operation'], ['type' => 'period_shift', 'mandat' => true] ], 'value_types' => $valueTypesAll |