Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Shubin <aleksandrs.subins@zabbix.com>2022-11-07 14:20:51 +0300
committerAlexander Shubin <aleksandrs.subins@zabbix.com>2022-11-07 14:20:56 +0300
commitc4c6761fb7513c0ff53c95c97c6d9f2f796c6456 (patch)
tree3e007c7bd1dee139a6f3e11b61e11534c9e98091
parenteb5829901f649034d39cda76ac26448037a02f8b (diff)
..F....... [ZBXNEXT-7469] fixed map widget
-rw-r--r--ui/include/classes/widgets/fields/CWidgetFieldReference.php2
-rw-r--r--ui/include/classes/widgets/fields/CWidgetFieldWidgetSelect.php4
-rw-r--r--ui/widgets/map/includes/WidgetForm.php3
3 files changed, 3 insertions, 6 deletions
diff --git a/ui/include/classes/widgets/fields/CWidgetFieldReference.php b/ui/include/classes/widgets/fields/CWidgetFieldReference.php
index a4445c68857..894aff69931 100644
--- a/ui/include/classes/widgets/fields/CWidgetFieldReference.php
+++ b/ui/include/classes/widgets/fields/CWidgetFieldReference.php
@@ -50,7 +50,7 @@ class CWidgetFieldReference extends CWidgetField {
* @param string $value Reference value. Only numeric characters allowed.
*/
public function setValue($value): self {
- if ($value === '' || ctype_alnum($value)) {
+ if ($value === '' || ctype_alnum((string) $value)) {
$this->value = $value;
}
diff --git a/ui/include/classes/widgets/fields/CWidgetFieldWidgetSelect.php b/ui/include/classes/widgets/fields/CWidgetFieldWidgetSelect.php
index 39b131a0d10..25c79fd5868 100644
--- a/ui/include/classes/widgets/fields/CWidgetFieldWidgetSelect.php
+++ b/ui/include/classes/widgets/fields/CWidgetFieldWidgetSelect.php
@@ -25,7 +25,7 @@ use Zabbix\Widgets\CWidgetField;
class CWidgetFieldWidgetSelect extends CWidgetField {
- public const DEFAULT_VALUE = -1;
+ public const DEFAULT_VALUE = '';
private string $search_by_value;
@@ -64,7 +64,7 @@ class CWidgetFieldWidgetSelect extends CWidgetField {
}
public function setValue($value): self {
- if ($value === '' || ctype_alnum($value)) {
+ if ($value === '' || ctype_alnum((string) $value)) {
$this->value = $value;
}
diff --git a/ui/widgets/map/includes/WidgetForm.php b/ui/widgets/map/includes/WidgetForm.php
index c91463cc66f..25e20c8d112 100644
--- a/ui/widgets/map/includes/WidgetForm.php
+++ b/ui/widgets/map/includes/WidgetForm.php
@@ -28,15 +28,12 @@ use Zabbix\Widgets\{
use Zabbix\Widgets\Fields\{
CWidgetFieldRadioButtonList,
- CWidgetFieldReference,
CWidgetFieldSelectResource,
CWidgetFieldWidgetSelect
};
use Widgets\Map\Widget;
-use Zabbix\Core\CWidget;
-
/**
* Map widget form.
*/