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

Visual Console Refactor: fixes 

Former-commit-id: 69203c99cd2890830f13fe135a44872f3b19faab
This commit is contained in:
Alejandro Gallardo Escobar 2019-04-12 09:51:53 +02:00
parent a71134fa2d
commit 08ffb3cd2f
2 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pandora_console/operation/visual_console/view.php
View File

@ -23,27 +23,23 @@ require_once $config['homedir'].'/include/functions_visual_map.php';
$visualConsoleId = (int) get_parameter(!is_metaconsole() ? 'id' : 'id_visualmap'); $visualConsoleId = (int) get_parameter(!is_metaconsole() ? 'id' : 'id_visualmap');
$pure = (bool) get_parameter('pure', $config['pure']); $pure = (bool) get_parameter('pure', $config['pure']);
if (!$visualConsoleId) { // Load Visual Console.
use Models\VisualConsole\Container as VisualConsole;
$visualConsole = null;
try {
$visualConsole = VisualConsole::fromDB(['id' => $visualConsoleId]);
} catch (Throwable $e) {
db_pandora_audit( db_pandora_audit(
'ACL Violation', 'ACL Violation',
'Trying to access visual console without id layout' 'Trying to access visual console without Id'
); );
include 'general/noaccess.php'; include 'general/noaccess.php';
exit; exit;
} }
$layout = db_get_row('tlayout', 'id', $visualConsoleId); $visualConsoleData = $visualConsole->toArray();
if (!$layout) { $groupId = $visualConsoleData['groupId'];
db_pandora_audit( $visualConsoleName = $visualConsoleData['name'];
'ACL Violation',
'Trying to access visual console without id layout'
);
include 'general/noaccess.php';
exit;
}
$groupId = $layout['id_group'];
$visualConsoleName = $layout['name'];
// ACL. // ACL.
$aclRead = check_acl($config['id_user'], $groupId, 'VR'); $aclRead = check_acl($config['id_user'], $groupId, 'VR');
@ -136,12 +132,6 @@ if (!is_metaconsole()) {
html_print_input_hidden('metaconsole', 1); html_print_input_hidden('metaconsole', 1);
} }
use Models\VisualConsole\Container as VisualConsole;
// TODO: Show an error message when the models can't be loaded.
$visualConsole = VisualConsole::fromArray($layout);
$visualConsoleItems = VisualConsole::getItemsFromDB($visualConsoleId);
// TODO: Extract to a function. // TODO: Extract to a function.
$baseUrl = ui_get_full_url(false, false, false, false); $baseUrl = ui_get_full_url(false, false, false, false);
$vcClientPath = 'include/visual-console-client'; $vcClientPath = 'include/visual-console-client';
@ -172,7 +162,7 @@ if (is_dir($dir)) {
} }
} }
echo '<div id="visual-console-container" style="margin:0px auto;position:relative;"></div>'; echo '<div id="visual-console-container"></div>';
if ($pure === true) { if ($pure === true) {
// Floating menu - Start. // Floating menu - Start.
@ -206,17 +196,20 @@ if ($pure === true) {
margin: 0px; margin: 0px;
overflow: hidden; overflow: hidden;
height: 100%; height: 100%;
background-color: <?php echo $layout['background_color']; ?>; background-color: <?php echo $visualConsoleData['backgroundColor']; ?>;
} }
div#main_pure { div#main_pure {
height: 100%; height: 100%;
margin: 0px; margin: 0px;
background-color: <?php echo $layout['background_color']; ?>; background-color: <?php echo $visualConsoleData['backgroundColor']; ?>;
} }
</style> </style>
<?php <?php
} }
// Load Visual Console Items.
$visualConsoleItems = VisualConsole::getItemsFromDB($visualConsoleId);
ui_require_javascript_file('pandora_visual_console'); ui_require_javascript_file('pandora_visual_console');
?> ?>
@ -233,7 +226,7 @@ ui_require_javascript_file('pandora_visual_console');
props, props,
items, items,
baseUrl, baseUrl,
10000, 100000,
handleUpdate handleUpdate
); );

5
visual_console_client/src/main.css
View File

@ -1,5 +1,8 @@
.visual-console-container { #visual-console-container {
margin: 0px auto;
position: relative; position: relative;
background-repeat: no-repeat;
background-size: contain;
} }
.visual-console-item { .visual-console-item {