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:
authorMārtiņš Tālbergs <martins.talbergs@zabbix.com>2021-03-02 14:22:53 +0300
committerMārtiņš Tālbergs <martins.talbergs@zabbix.com>2021-03-02 14:22:53 +0300
commitd5022e17405758364b36690c77c8793acf2620b9 (patch)
treea4f21c98f340d2c4f359d0e930724607585d0a67
parentc5f488781cc065ea7a11431cadf142b409919656 (diff)
..F....... [ZBXNEXT-6288] removed unused screen resource defines
-rw-r--r--ui/include/classes/screens/CScreenBuilder.php3
-rw-r--r--ui/include/defines.inc.php27
-rw-r--r--ui/include/views/js/common.init.js.php2
3 files changed, 1 insertions, 31 deletions
diff --git a/ui/include/classes/screens/CScreenBuilder.php b/ui/include/classes/screens/CScreenBuilder.php
index 4b2442a30c9..4c1e80ae1c8 100644
--- a/ui/include/classes/screens/CScreenBuilder.php
+++ b/ui/include/classes/screens/CScreenBuilder.php
@@ -162,9 +162,6 @@ class CScreenBuilder {
// get screen
switch ($options['resourcetype']) {
- case SCREEN_RESOURCE_GRAPH:
- return new CScreenGraph($options);
-
case SCREEN_RESOURCE_MAP:
return new CScreenMap($options);
diff --git a/ui/include/defines.inc.php b/ui/include/defines.inc.php
index 0785aa76eea..68535033162 100644
--- a/ui/include/defines.inc.php
+++ b/ui/include/defines.inc.php
@@ -743,31 +743,10 @@ define('CONDITION_EVAL_TYPE_EXPRESSION', 3);
define('SCREEN_RESOURCE_GRAPH', 0);
define('SCREEN_RESOURCE_SIMPLE_GRAPH', 1);
define('SCREEN_RESOURCE_MAP', 2);
-define('SCREEN_RESOURCE_PLAIN_TEXT', 3);
-define('SCREEN_RESOURCE_HOST_INFO', 4);
-define('SCREEN_RESOURCE_TRIGGER_INFO', 5);
-define('SCREEN_RESOURCE_SERVER_INFO', 6);
-define('SCREEN_RESOURCE_CLOCK', 7);
-define('SCREEN_RESOURCE_SCREEN', 8); // Not supported since Zabbix 4.4.
-define('SCREEN_RESOURCE_TRIGGER_OVERVIEW', 9);
-define('SCREEN_RESOURCE_DATA_OVERVIEW', 10);
-define('SCREEN_RESOURCE_URL', 11);
-define('SCREEN_RESOURCE_ACTIONS', 12);
-define('SCREEN_RESOURCE_EVENTS', 13);
-define('SCREEN_RESOURCE_HOSTGROUP_TRIGGERS',14);
-define('SCREEN_RESOURCE_SYSTEM_STATUS', 15);
-define('SCREEN_RESOURCE_HOST_TRIGGERS', 16);
-// used in Monitoring > Latest data > Graph (history.php)
define('SCREEN_RESOURCE_HISTORY', 17);
-define('SCREEN_RESOURCE_LLD_SIMPLE_GRAPH', 19);
-define('SCREEN_RESOURCE_LLD_GRAPH', 20);
-// used in Monitoring > Web > Details (httpdetails.php)
define('SCREEN_RESOURCE_HTTPTEST_DETAILS', 21);
-// used in Monitoring > Discovery
define('SCREEN_RESOURCE_DISCOVERY', 22);
-// used in Monitoring > Web
define('SCREEN_RESOURCE_HTTPTEST', 23);
-// used in Monitoring > Problems
define('SCREEN_RESOURCE_PROBLEM', 24);
define('SCREEN_SORT_TRIGGERS_DATE_DESC', 0);
@@ -794,12 +773,6 @@ define('SCREEN_MODE_JS', 3);
define('SCREEN_SIMPLE_ITEM', 0);
define('SCREEN_DYNAMIC_ITEM', 1);
-define('SCREEN_REFRESH_RESPONSIVENESS', 10);
-
-define('SCREEN_SURROGATE_MAX_COLUMNS_MIN', 1);
-define('SCREEN_SURROGATE_MAX_COLUMNS_DEFAULT', 3);
-define('SCREEN_SURROGATE_MAX_COLUMNS_MAX', 100);
-
define('SCREEN_MIN_SIZE', 1);
define('SCREEN_MAX_SIZE', 100);
diff --git a/ui/include/views/js/common.init.js.php b/ui/include/views/js/common.init.js.php
index 837e60e80c6..fd927c8393c 100644
--- a/ui/include/views/js/common.init.js.php
+++ b/ui/include/views/js/common.init.js.php
@@ -31,7 +31,7 @@
<?php endif ?>
<?php if (isset($page['scripts']) && in_array('flickerfreescreen.js', $page['scripts'])): ?>
- window.flickerfreeScreen.responsiveness = <?php echo SCREEN_REFRESH_RESPONSIVENESS * 1000; ?>;
+ window.flickerfreeScreen.responsiveness = 10000;
<?php endif ?>
// the chkbxRange.init() method must be called after the inserted post scripts and initializing cookies