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
path: root/ui/app
diff options
context:
space:
mode:
authorGregory Chalenko <gregory.chalenko@zabbix.com>2020-07-31 14:11:10 +0300
committerGregory Chalenko <gregory.chalenko@zabbix.com>2020-07-31 14:11:10 +0300
commit086820b6dabd008a1bf665440ef307035a4e4e77 (patch)
treeccaecce0b51040a517d0e678a9bfffc60d7342fa /ui/app
parentb4714e81e80924281de78185facb817601724d6f (diff)
..F....... [ZBXNEXT-710] added timeselector support
Diffstat (limited to 'ui/app')
-rw-r--r--ui/app/controllers/CControllerHost.php2
-rw-r--r--ui/app/controllers/CControllerHostView.php8
-rw-r--r--ui/app/controllers/CControllerHostViewRefresh.php2
-rw-r--r--ui/app/controllers/CControllerTimeSelectorUpdate.php2
-rw-r--r--ui/app/views/monitoring.host.view.php2
5 files changed, 8 insertions, 8 deletions
diff --git a/ui/app/controllers/CControllerHost.php b/ui/app/controllers/CControllerHost.php
index 78ee6668272..cfec8b61cfd 100644
--- a/ui/app/controllers/CControllerHost.php
+++ b/ui/app/controllers/CControllerHost.php
@@ -41,8 +41,6 @@ abstract class CControllerHost extends CController {
'severities' => [],
'show_suppressed' => ZBX_PROBLEM_SUPPRESSED_FALSE,
'maintenance_status' => HOST_MAINTENANCE_STATUS_ON,
- 'from' => 'now-1d',
- 'to' => 'now',
'page' => null,
'sort' => 'name',
'sortorder' => ZBX_SORT_UP
diff --git a/ui/app/controllers/CControllerHostView.php b/ui/app/controllers/CControllerHostView.php
index cea6d0e2ebd..451c2943235 100644
--- a/ui/app/controllers/CControllerHostView.php
+++ b/ui/app/controllers/CControllerHostView.php
@@ -46,8 +46,12 @@ class CControllerHostView extends CControllerHostViewRefresh {
'refresh_interval' => CWebUser::getRefresh() * 1000,
'filter_view' => 'monitoring.host.filter',
'filter_defaults' => $profile->filter_defaults,
- 'from' => $filter['from'],
- 'to' => $filter['to'],
+ 'timerange' => [
+ 'idx' => '',
+ 'idx2' => '',
+ 'from' => ZBX_PERIOD_DEFAULT_FROM,
+ 'to' => ZBX_PERIOD_DEFAULT_TO,
+ ],
'filter_tabs' => $filter_tabs,
'tab_selected' => $profile->selected,
'tab_expanded' => $profile->expanded
diff --git a/ui/app/controllers/CControllerHostViewRefresh.php b/ui/app/controllers/CControllerHostViewRefresh.php
index b6e1e819b87..f4894196386 100644
--- a/ui/app/controllers/CControllerHostViewRefresh.php
+++ b/ui/app/controllers/CControllerHostViewRefresh.php
@@ -45,8 +45,6 @@ class CControllerHostViewRefresh extends CControllerHost {
'sort' => 'in name,status',
'sortorder' => 'in '.ZBX_SORT_UP.','.ZBX_SORT_DOWN,
'page' => 'ge 1',
- 'from' => 'string',
- 'to' => 'string',
'filter_name' => 'string',
'filter_custom_time' => 'in 1,0',
'filter_show_counter' => 'in 1,0',
diff --git a/ui/app/controllers/CControllerTimeSelectorUpdate.php b/ui/app/controllers/CControllerTimeSelectorUpdate.php
index 6982010dbb1..7ad5d34038a 100644
--- a/ui/app/controllers/CControllerTimeSelectorUpdate.php
+++ b/ui/app/controllers/CControllerTimeSelectorUpdate.php
@@ -40,7 +40,7 @@ class CControllerTimeSelectorUpdate extends CController {
protected function checkInput() {
$profiles = ['web.dashbrd.filter', 'web.screens.filter', 'web.charts.filter', 'web.httpdetails.filter',
'web.problem.filter', 'web.auditlog.filter', 'web.slides.filter', 'web.auditacts.filter',
- 'web.item.graph.filter', 'web.toptriggers.filter', 'web.avail_report.filter'
+ 'web.item.graph.filter', 'web.toptriggers.filter', 'web.avail_report.filter', CControllerHost::FILTER_IDX
];
$fields = [
diff --git a/ui/app/views/monitoring.host.view.php b/ui/app/views/monitoring.host.view.php
index e7ba9e893dc..6f39427e666 100644
--- a/ui/app/views/monitoring.host.view.php
+++ b/ui/app/views/monitoring.host.view.php
@@ -56,7 +56,7 @@ if ($web_layout_mode == ZBX_LAYOUT_NORMAL) {
$filter->addTemplatedTab($tab['filter_name'], $tab);
}
- $filter->addTimeselector($data['from'], $data['to']);
+ $filter->addTimeselector($data['timerange']);
// Set javascript options for tab filter initialization in monitoring.host.view.js.php file.
$data['filter_options'] = $filter->options;