From 0bd276bc884fcf4ab2c1d80d59cdd8214cdbe628 Mon Sep 17 00:00:00 2001 From: Alejandro Gallardo Escobar Date: Thu, 25 Apr 2019 14:02:30 +0200 Subject: [PATCH] Visual Console Refactor: bugfix Former-commit-id: f7e4f04507695550c96f91a296e316be3c18636d --- .../include/rest-api/models/VisualConsole/Item.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/rest-api/models/VisualConsole/Item.php b/pandora_console/include/rest-api/models/VisualConsole/Item.php index 122a9549b6..8db4e720a3 100644 --- a/pandora_console/include/rest-api/models/VisualConsole/Item.php +++ b/pandora_console/include/rest-api/models/VisualConsole/Item.php @@ -880,6 +880,7 @@ class Item extends Model global $config; // Load side libraries. + include_once $config['homedir'].'/include/functions_ui.php'; if (\is_metaconsole()) { \enterprise_include_once('include/functions_metaconsole.php'); \enterprise_include_once('meta/include/functions_ui_meta.php'); @@ -889,7 +890,7 @@ class Item extends Model $linkedModule = static::extractLinkedModule($data); $linkedAgent = static::extractLinkedAgent($data); - $baseUrl = $config['homeurl'].'index.php'; + $baseUrl = \ui_get_full_url(); // TODO: There's a feature to get the link from the label. if (static::$useLinkedVisualConsole === true @@ -1052,7 +1053,8 @@ class Item extends Model return null; } } - } else if (static::$useLinkedAgent === true + } else if ((static::$useLinkedAgent === true + || static::$useLinkedModule === true) && $linkedAgent['agentId'] !== null && $linkedAgent['agentId'] > 0 ) {