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

2014-06-17 Alejandro Gallardo <alejandro.gallardo@artica.es> 

* godmode/reporting/visual_console_builder.editor.js:
	Modified the function "loadFieldsFromDB" to fix the graph
	type selection.

	* include/functions_visual_map_editor.php: Visual changes
	on the form created by the function
	"visual_map_editor_print_item_palette".


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10223 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
alexhigh 2014-06-17 17:04:59 +00:00
parent 989166a354
commit 89fbeca7f1
3 changed files with 31 additions and 18 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-06-17 Alejandro Gallardo <alejandro.gallardo@artica.es>
* godmode/reporting/visual_console_builder.editor.js:
Modified the function "loadFieldsFromDB" to fix the graph
type selection.
* include/functions_visual_map_editor.php: Visual changes
on the form created by the function
"visual_map_editor_print_item_palette".
2014-06-17 Sergio Martin <sergio.martin@artica.es> 2014-06-17 Sergio Martin <sergio.martin@artica.es>
* include/graphs/functions_flot.php: Fix height of the * include/graphs/functions_flot.php: Fix height of the

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

@ -585,14 +585,6 @@ function loadFieldsFromDB(item) {
} }
if (key == 'id_custom_graph') {
$("input[name='radio_choice'][value='custom_graph']")
.prop('checked', true);
$("input[name='radio_choice']").trigger('change');
$("#custom_graph option[value=" + val + "]")
.prop("selected", true);
}
if (metaconsole != 0) { if (metaconsole != 0) {
if (key == 'id_agent') { if (key == 'id_agent') {
$("#hidden-agent").val(val); $("#hidden-agent").val(val);
@ -602,13 +594,25 @@ function loadFieldsFromDB(item) {
} }
} }
}); });
if (data.type == 1) {
if (data.id_custom_graph > 0) {
$("input[name='radio_choice'][value='custom_graph']")
.prop('checked', true);
$("input[name='radio_choice']").trigger('change');
$("#custom_graph option[value=" + data.id_custom_graph + "]")
.prop("selected", true);
}
else {
$("input[name='radio_choice'][value='module_graph']")
.prop('checked', true);
$("input[name='radio_choice']").trigger('change');
}
}
if (typeof(enterprise_loadFieldsFromDB) == 'function') { if (typeof(enterprise_loadFieldsFromDB) == 'function') {
enterprise_loadFieldsFromDB(data); enterprise_loadFieldsFromDB(data);
} }
} }
}); });
} }

13
pandora_console/include/functions_visual_map_editor.php
View File

@ -146,13 +146,12 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
'datos'); 'datos');
$form_items['radio_choice_graph']['html'] = $form_items['radio_choice_graph']['html'] =
'<td align="left" style=""></td> '<td align="left" style=""></td>
<td align="left" style="">' . <td align="left" style="">'
html_print_radio_button('radio_choice', . __('Module graph') . "&nbsp;&nbsp;" .
'module_graph', __('Module graph'), 'module_graph', html_print_radio_button('radio_choice', 'module_graph', '', 'module_graph', true)
true) . . "&nbsp;&nbsp;&nbsp;&nbsp;"
html_print_radio_button('radio_choice', . __('Custom graph') . "&nbsp;&nbsp;" .
'custom_graph', __('Custom graph'), 'module_graph', html_print_radio_button('radio_choice', 'custom_graph', '', 'module_graph', true) .
true) .
'</td>'; '</td>';