tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 00:34:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Visual Console Refactor: bugfix

Browse Source 
Former-commit-id: f7e4f04507695550c96f91a296e316be3c18636d
This commit is contained in:
Alejandro Gallardo Escobar 2019-04-25 14:02:30 +02:00
parent 7d95151a5b
commit 0bd276bc88
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/rest-api/models/VisualConsole/Item.php
View File

@ -880,6 +880,7 @@ class Item extends Model
global $config; global $config;
// Load side libraries. // Load side libraries.
include_once $config['homedir'].'/include/functions_ui.php';
if (\is_metaconsole()) { if (\is_metaconsole()) {
\enterprise_include_once('include/functions_metaconsole.php'); \enterprise_include_once('include/functions_metaconsole.php');
\enterprise_include_once('meta/include/functions_ui_meta.php'); \enterprise_include_once('meta/include/functions_ui_meta.php');
@ -889,7 +890,7 @@ class Item extends Model
$linkedModule = static::extractLinkedModule($data); $linkedModule = static::extractLinkedModule($data);
$linkedAgent = static::extractLinkedAgent($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. // TODO: There's a feature to get the link from the label.
if (static::$useLinkedVisualConsole === true if (static::$useLinkedVisualConsole === true
@ -1052,7 +1053,8 @@ class Item extends Model
return null; return null;
} }
} }
} else if (static::$useLinkedAgent === true } else if ((static::$useLinkedAgent === true
|| static::$useLinkedModule === true)
&& $linkedAgent['agentId'] !== null && $linkedAgent['agentId'] !== null
&& $linkedAgent['agentId'] > 0 && $linkedAgent['agentId'] > 0
) { ) {