From 7f4d64267999f30c602aa524a219b7c330c6a18f Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Tue, 2 Dec 2014 11:39:45 +0100 Subject: [PATCH] Added the lost fields for item group in the editor. (cherry picked from commit a3e6b09758c10f0792a89ad60fb0d8d3f1317332) --- .../reporting/visual_console_builder.elements.php | 12 +++++------- pandora_console/include/functions_visual_map.php | 12 ++++++++++-- .../include/functions_visual_map_editor.php | 11 +++++++---- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/pandora_console/godmode/reporting/visual_console_builder.elements.php b/pandora_console/godmode/reporting/visual_console_builder.elements.php index 20abbdaab7..2d6b854cb3 100644 --- a/pandora_console/godmode/reporting/visual_console_builder.elements.php +++ b/pandora_console/godmode/reporting/visual_console_builder.elements.php @@ -208,6 +208,7 @@ foreach ($layoutDatas as $layoutData) { ',' . html_print_input_text('top_' . $idLayoutData, $layoutData['pos_y'], '', 2, 5, true) . ')'; + //Parent switch ($layoutData['type']) { case BOX_ITEM: @@ -215,14 +216,10 @@ foreach ($layoutDatas as $layoutData) { $table->data[$i + 1][4] = ""; break; default: - $table->data[$i + 1][4] = html_print_select_from_sql( - 'SELECT id, label - FROM tlayout_data - WHERE id_layout = '. $idVisualConsole . ' - AND id !=' . $idLayoutData, + $parents = visual_map_get_items_parents($idVisualConsole); + $table->data[$i + 1][4] = html_print_select($parents, 'parent_' . $idLayoutData, $layoutData['parent_item'], - '', 'None', 0, true, false, true, false, - 'width: 120px;'); + '', __('None'), 0, true); } //Delete row button @@ -243,6 +240,7 @@ foreach ($layoutDatas as $layoutData) { //Second row $table->data[$i + 2]['icon'] = ''; + //Agent switch ($layoutData['type']) { case GROUP_ITEM: diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index 4c1e7d5f97..6129478d0b 100644 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -2246,6 +2246,10 @@ function visual_map_create_internal_name_item($label = null, $type, $image, $age case LABEL: $text = __('Label'); break; + case GROUP_ITEM: + case 'group_item': + $text = __('Group') . " - "; + break; case 'icon': case ICON: $text = __('Icon') . " - " . @@ -2285,8 +2289,12 @@ function visual_map_get_items_parents($idVisual) { $agent = io_safe_output(agents_get_name($item['id_agent'])); } - $return[$item['id']] = visual_map_create_internal_name_item($item['label'], - $item['type'], $item['image'], $agent, $item['id_agente_modulo'], + $return[$item['id']] = visual_map_create_internal_name_item( + $item['label'], + $item['type'], + $item['image'], + $agent, + $item['id_agente_modulo'], $item['id']); } diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php index 39a0b364c0..24514bd2ce 100644 --- a/pandora_console/include/functions_visual_map_editor.php +++ b/pandora_console/include/functions_visual_map_editor.php @@ -367,7 +367,8 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) { ')'; $form_items_advance['size_row'] = array(); - $form_items_advance['size_row']['items'] = array('background', + $form_items_advance['size_row']['items'] = array( + 'group_item', 'background', 'static_graph', 'icon datos'); $form_items_advance['size_row']['html'] = '' . __('Size') . @@ -382,7 +383,8 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) { $parents = visual_map_get_items_parents($visualConsole_id); $form_items_advance['parent_row'] = array(); - $form_items_advance['parent_row']['items'] = array('static_graph', + $form_items_advance['parent_row']['items'] = array( + 'group_item', 'static_graph', 'percentile_bar', 'percentile_item', 'module_graph', 'simple_value', 'label', 'icon', 'datos'); $form_items_advance['parent_row']['html'] = '' . @@ -394,8 +396,9 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) { $form_items_advance['map_linked_row'] = array(); $form_items_advance['map_linked_row']['items'] = array( - 'static_graph', 'percentile_bar', 'percentile_item', - 'module_graph', 'simple_value', 'icon', 'label', 'datos'); + 'group_item', 'static_graph', 'percentile_bar', + 'percentile_item', 'module_graph', 'simple_value', + 'icon', 'label', 'datos'); $form_items_advance['map_linked_row']['html'] = ''. __('Map linked') . '' . '' . html_print_select_from_sql (