From 806310d8d1e0c810deb9d453e626c7e14b0e59b3 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Wed, 17 Apr 2019 15:39:55 +0200 Subject: [PATCH] Fixed StaticGraph Former-commit-id: 512635353ed672969ca4d13859ce073370115a7b --- .../include/rest-api/models/VisualConsole/Item.php | 10 ++++++++++ .../models/VisualConsole/Items/StaticGraph.php | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/rest-api/models/VisualConsole/Item.php b/pandora_console/include/rest-api/models/VisualConsole/Item.php index a17da91f9a..9506f060dc 100644 --- a/pandora_console/include/rest-api/models/VisualConsole/Item.php +++ b/pandora_console/include/rest-api/models/VisualConsole/Item.php @@ -720,6 +720,11 @@ class Item extends Model throw new \InvalidArgumentException('invalid agent Id'); } + // Staticgraph don't need to have an agent. + if ($agentId === 0) { + return $agentData; + } + if (\is_metaconsole() && $metaconsoleId === null) { throw new \InvalidArgumentException('missing metaconsole node Id'); } @@ -776,6 +781,11 @@ class Item extends Model throw new \InvalidArgumentException('invalid module Id'); } + // Staticgraph don't need to have a module. + if ($moduleId === 0) { + return $moduleData; + } + // We should add the metaconsole Id if we can. $metaconsoleId = static::extractMetaconsoleId($itemData); diff --git a/pandora_console/include/rest-api/models/VisualConsole/Items/StaticGraph.php b/pandora_console/include/rest-api/models/VisualConsole/Items/StaticGraph.php index 6a2700bfd4..32c2a3df17 100644 --- a/pandora_console/include/rest-api/models/VisualConsole/Items/StaticGraph.php +++ b/pandora_console/include/rest-api/models/VisualConsole/Items/StaticGraph.php @@ -190,7 +190,7 @@ final class StaticGraph extends Item } // Get last value. - if (isset($data['show_last_value']) && $data['show_last_value'] !== 2) { + if (isset($data['show_last_value']) && $data['show_last_value'] !== 2 && $moduleId !== 0) { $imgTitle = ''; $unit_text = \trim(\io_safe_output(\modules_get_unit($moduleId)));