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

2014-05-30 Miguel de Dios <miguel.dedios@artica.es> 

* godmode/reporting/visual_console_builder.editor.js,
	include/functions_visual_map_editor.php: fixed the palette tool for
	item group.
	
	Incident: #838




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10050 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2014-05-30 11:57:37 +00:00
parent 062a06c369
commit 04fbea7ee0
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2014-05-30 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/visual_console_builder.editor.js,
include/functions_visual_map_editor.php: fixed the palette tool for
item group.
Incident: #838
2014-05-30 Sergio Martin <sergio.martin@artica.es>
* godmode/servers/manage_recontask_form.php: Changed the recon task

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

@ -57,15 +57,17 @@ function visual_map_main() {
$("input[name='radio_choice']").on('change', function() {
var radio_value = $("input[name='radio_choice']:checked").val();
if (radio_value == "module_graph") {
$("#custom_graph_row").css('display', 'none');
$("#agent_row").css('display', '');
$("#module_row").css('display', '');
}
else {
$("#custom_graph_row").css('display', '');
$("#agent_row").css('display', 'none');
$("#module_row").css('display', 'none');
if ((creationItem == 'module_graph') || (selectedItem == 'module_graph')) {
if (radio_value == "module_graph") {
$("#custom_graph_row").css('display', 'none');
$("#agent_row").css('display', '');
$("#module_row").css('display', '');
}
else {
$("#custom_graph_row").css('display', '');
$("#agent_row").css('display', 'none');
$("#module_row").css('display', 'none');
}
}
});
}

5
pandora_console/include/functions_visual_map_editor.php
View File

@ -56,7 +56,8 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
'module_graph' => __('Graph'),
'simple_value' => __('Simple value'),
'label' => __('Label'),
'icon' => __('Icon'));
'icon' => __('Icon'),
'group_item' => __('Group'));
if (enterprise_installed()) {
enterprise_visual_map_editor_add_title_palette($titles);
@ -206,7 +207,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
else
$return_all_group = true;
$form_items['group_row'] = array();
$form_items['group_row']['items'] = array('group_item');
$form_items['group_row']['items'] = array('group_item', 'datos');
$form_items['group_row']['html'] = '<td align="left">' .
__('Group') .
'</td>