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:
-rw-r--r--ChangeLog.d/bugfix/ZBX-178211
-rw-r--r--ui/app/controllers/CControllerWidgetIteratorGraphPrototypeView.php1
-rw-r--r--ui/tests/selenium/dashboard/testDynamicItemWidgets.php3
3 files changed, 2 insertions, 3 deletions
diff --git a/ChangeLog.d/bugfix/ZBX-17821 b/ChangeLog.d/bugfix/ZBX-17821
new file mode 100644
index 00000000000..b9d215cd8c9
--- /dev/null
+++ b/ChangeLog.d/bugfix/ZBX-17821
@@ -0,0 +1 @@
+..F....... [ZBX-17821] fixed default header for inaccessible iterator widget content (talbergs)
diff --git a/ui/app/controllers/CControllerWidgetIteratorGraphPrototypeView.php b/ui/app/controllers/CControllerWidgetIteratorGraphPrototypeView.php
index 4f938d10b87..f8ec5fd7f5a 100644
--- a/ui/app/controllers/CControllerWidgetIteratorGraphPrototypeView.php
+++ b/ui/app/controllers/CControllerWidgetIteratorGraphPrototypeView.php
@@ -274,6 +274,7 @@ class CControllerWidgetIteratorGraphPrototypeView extends CControllerWidgetItera
*/
protected function inaccessibleError() {
return [
+ 'header' => $this->getDefaultHeader(),
'body' => (new CTableInfo())
->setNoDataMessage(_('No permissions to referred object or it does not exist!'))
->toString()
diff --git a/ui/tests/selenium/dashboard/testDynamicItemWidgets.php b/ui/tests/selenium/dashboard/testDynamicItemWidgets.php
index 3e63b6bab5e..69b35b68abc 100644
--- a/ui/tests/selenium/dashboard/testDynamicItemWidgets.php
+++ b/ui/tests/selenium/dashboard/testDynamicItemWidgets.php
@@ -294,9 +294,6 @@ class testDynamicItemWidgets extends CWebTest {
$host->clear()->type($data['host_filter']);
}
$this->page->waitUntilReady();
- // TODO: remove after fix ZBX-17821
- $this->page->refresh();
- $this->page->waitUntilReady();
}
$this->assertWidgetContent($data['widgets']);