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

2014-01-23 Miguel de Dios <miguel.dedios@artica.es> 

* godmode/reporting/visual_console_builder.editor.js,
	include/functions_visual_map.php,
	include/ajax/visual_console_builder.ajax.php: fixes the bug for
	the simple values positions and the enable links in the static
	graph.
	
	Incidents: #536 and #535 from local tracker




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9357 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2014-01-23 13:52:43 +00:00
parent 3e64619f30
commit d59437f34a
4 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,3 +1,13 @@
2014-01-23 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/visual_console_builder.editor.js,
include/functions_visual_map.php,
include/ajax/visual_console_builder.ajax.php: fixes the bug for
the simple values positions and the enable links in the static
graph.
Incidents: #536 and #535 from local tracker
2014-01-22 Sergio Martin <sergio.martin@artica.es> 2014-01-22 Sergio Martin <sergio.martin@artica.es>
* godmode/alerts/alert_view.php: Add exception * godmode/alerts/alert_view.php: Add exception

11
pandora_console/godmode/reporting/visual_console_builder.editor.js
View File

@ -451,7 +451,16 @@ function loadFieldsFromDB(item) {
$("input[name=label]").val(val); $("input[name=label]").val(val);
} }
if (key == 'enable_link') $("input[name=enable_link]").val(val); if (key == 'enable_link') {
if (val == "1") {
$("input[name=enable_link]")
.prop("checked", true);
}
else {
$("input[name=enable_link]")
.prop("checked", false);
}
}
if (key == 'image') { if (key == 'image') {
//Load image preview //Load image preview

1
pandora_console/include/ajax/visual_console_builder.ajax.php
View File

@ -576,6 +576,7 @@ switch ($action) {
$values['label_color'] = $label_color; $values['label_color'] = $label_color;
$values['parent_item'] = $parent; $values['parent_item'] = $parent;
$values['no_link_color'] = 1; $values['no_link_color'] = 1;
$values['enable_link'] = $enable_link;
switch ($type) { switch ($type) {
case 'module_graph': case 'module_graph':

2
pandora_console/include/functions_visual_map.php
View File

@ -210,7 +210,7 @@ function visual_map_print_item($layoutData) {
case SIMPLE_VALUE_MIN: case SIMPLE_VALUE_MIN:
case SIMPLE_VALUE_AVG: case SIMPLE_VALUE_AVG:
$io_safe_output_text = io_safe_output($text); $io_safe_output_text = io_safe_output($text);
echo '<div id="' . $id . '" class="item simple_value" style="z-index: 1; left: 0px; top: 0px; color: ' . $color . '; text-align: center; position: absolute; ' . $sizeStyle . ' margin-top: ' . $top . 'px; margin-left: ' . $left . 'px;">'; echo '<div id="' . $id . '" class="item simple_value" style="z-index: 1; left: 0px; top: 0px; color: ' . $color . '; text-align: center; position: absolute; ' . $sizeStyle . ' top: ' . $top . 'px; left: ' . $left . 'px;">';
echo $io_safe_output_text; echo $io_safe_output_text;
//Metaconsole db connection //Metaconsole db connection