tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-10650-bugs-funcionales-en-consolas-visuales' into 'develop' 

Ent 10650 bugs funcionales en consolas visuales

See merge request artica/pandorafms!5601
This commit is contained in:
Matias Didier 2023-03-24 09:11:26 +00:00
parent f14be9c523 fe70d7d44b
commit 5529c33f0c
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/include/rest-api/models/VisualConsole/Items/DonutGraph.php
View File

@ -226,7 +226,7 @@ final class DonutGraph extends Item
'module_input' => true, 'module_input' => true,
'module_name' => 'moduleId', 'module_name' => 'moduleId',
'module_none' => false, 'module_none' => false,
'get_only_string_modules' => true, 'get_only_string_modules' => false,
], ],
]; ];
@ -235,14 +235,13 @@ final class DonutGraph extends Item
'label' => __('Module'), 'label' => __('Module'),
'arguments' => [ 'arguments' => [
'type' => 'autocomplete_module', 'type' => 'autocomplete_module',
'fields' => $fields,
'name' => 'moduleId', 'name' => 'moduleId',
'selected' => $values['moduleId'], 'selected' => $values['moduleId'],
'return' => true, 'return' => true,
'sort' => false, 'sort' => false,
'agent_id' => $values['agentId'], 'agent_id' => $values['agentId'],
'metaconsole_id' => $values['metaconsoleId'], 'metaconsole_id' => $values['metaconsoleId'],
'get_only_string_modules' => true, 'get_only_string_modules' => false,
], ],
]; ];

13
pandora_console/operation/visual_console/public_view.php
View File

@ -62,7 +62,13 @@ require_once 'include/functions_visual_map.php';
$hash = (string) get_parameter('hash'); $hash = (string) get_parameter('hash');
$visualConsoleId = (int) get_parameter('id_layout'); $visualConsoleId = (int) get_parameter('id_layout');
$config['id_user'] = (string) get_parameter('id_user'); $userAccessMaintenance = null;
if (empty($config['id_user']) === true) {
$config['id_user'] = (string) get_parameter('id_user');
} else {
$userAccessMaintenance = $config['id_user'];
}
$refr = (int) get_parameter('refr', ($config['refr'] ?? null)); $refr = (int) get_parameter('refr', ($config['refr'] ?? null));
if (!isset($config['pure'])) { if (!isset($config['pure'])) {
@ -179,6 +185,7 @@ $visualConsoleItems = VisualConsole::getItemsFromDB(
<script type="text/javascript"> <script type="text/javascript">
var container = document.getElementById("visual-console-container"); var container = document.getElementById("visual-console-container");
var user = "<?php echo $userAccessMaintenance; ?>";
var props = <?php echo (string) $visualConsole; ?>; var props = <?php echo (string) $visualConsole; ?>;
var items = <?php echo '['.implode(',', $visualConsoleItems).']'; ?>; var items = <?php echo '['.implode(',', $visualConsoleItems).']'; ?>;
var baseUrl = "<?php echo ui_get_full_url('/', false, false, false); ?>"; var baseUrl = "<?php echo ui_get_full_url('/', false, false, false); ?>";
@ -282,7 +289,9 @@ $visualConsoleItems = VisualConsole::getItemsFromDB(
); );
if(props.maintenanceMode != null) { if(props.maintenanceMode != null) {
visualConsoleManager.visualConsole.enableMaintenanceMode(); if(props.maintenanceMode.user !== user) {
visualConsoleManager.visualConsole.enableMaintenanceMode();
}
} }
var controls = document.getElementById('vc-controls'); var controls = document.getElementById('vc-controls');