From f83e093091f05f8dc605d24f31b4c809391e8bc4 Mon Sep 17 00:00:00 2001 From: enriquecd Date: Mon, 29 Jan 2018 19:15:28 +0100 Subject: [PATCH] Ending creator wizard, fix cluster list, change data modules on update - #1748 --- .../general/firts_task/cluster_builder.php | 2 +- .../godmode/reporting/cluster_builder.main.php | 8 ++------ .../godmode/reporting/cluster_list.php | 5 ++--- .../images/firts_task/icono-cluster-activo.png | Bin 0 -> 3975 bytes pandora_console/images/os_icons/so_cluster.png | Bin 0 -> 850 bytes pandora_console/pandoradb_data.sql | 2 +- 6 files changed, 6 insertions(+), 11 deletions(-) create mode 100644 pandora_console/images/firts_task/icono-cluster-activo.png create mode 100644 pandora_console/images/os_icons/so_cluster.png diff --git a/pandora_console/general/firts_task/cluster_builder.php b/pandora_console/general/firts_task/cluster_builder.php index a9c4cf2083..e0ca22576a 100644 --- a/pandora_console/general/firts_task/cluster_builder.php +++ b/pandora_console/general/firts_task/cluster_builder.php @@ -25,7 +25,7 @@ ui_print_info_message ( array('no_close'=>true, 'message'=> __('There are no cl
- __('Clusters')));?> + __('Clusters')));?>

diff --git a/pandora_console/godmode/reporting/cluster_builder.main.php b/pandora_console/godmode/reporting/cluster_builder.main.php index e5002e2df1..38f8bbb486 100644 --- a/pandora_console/godmode/reporting/cluster_builder.main.php +++ b/pandora_console/godmode/reporting/cluster_builder.main.php @@ -250,13 +250,9 @@ elseif($step == 2){ $cluster_agents_all[$value['id_agente']] = $value['alias']; } - $cluster_agents_out = array(); - $cluster_agents_out = array_diff_key($template_agents_all, $template_agents_in); + $cluster_agents_out = array_diff_key($cluster_agents_all,$cluster_agents_in); - $cluster_agents_in_keys = array_keys($template_agents_in); - $cluster_agents_out_keys = array_keys($template_agents_out); - - html_print_select ($cluster_agents_all, 'id_agents[]', 0, false, '', '', false, true, true, '', false, 'width: 100%;', $option_style); + html_print_select ($cluster_agents_out, 'id_agents[]', 0, false, '', '', false, true, true, '', false, 'width: 100%;', $option_style); echo ""; diff --git a/pandora_console/godmode/reporting/cluster_list.php b/pandora_console/godmode/reporting/cluster_list.php index e7c3857f1e..e70aa21e06 100644 --- a/pandora_console/godmode/reporting/cluster_list.php +++ b/pandora_console/godmode/reporting/cluster_list.php @@ -77,8 +77,7 @@ ui_pagination (count($clusters)); foreach ($clusters as $cluster) { $data = array (); - $data[0] = ''.$cluster["name"].' - Enlace Map Dani (Mapa de red)

'. - ''.$cluster["name"].' - Enlace Enrique (pantalla informativa)'; + $data[0] = ''.$cluster["name"].''; $data[1] = ui_print_truncate_text($cluster["description"], 70); $data[2] = ui_print_group_icon($cluster['group'],true); @@ -143,7 +142,7 @@ ui_pagination (count($clusters)); break; } - $data[6] = " + $data[6] = " "; array_push ($table->data, $data); diff --git a/pandora_console/images/firts_task/icono-cluster-activo.png b/pandora_console/images/firts_task/icono-cluster-activo.png new file mode 100644 index 0000000000000000000000000000000000000000..49720af75d05c705325a09de719482cf257832bf GIT binary patch literal 3975 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 literal 0 HcmV?d00001 diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index 27dbfea739..3f850e0bd0 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -142,7 +142,7 @@ INSERT INTO `tconfig_os` (`id_os`, `name`, `description`, `icon_name`) VALUES (18, 'Switch', 'Generic switch', 'so_switch.png'), (19, 'Satellite', 'Satellite agent', 'satellite.png'), (20, 'Mainframe', 'Mainframe agent', 'so_mainframe.png'), -(21, 'Cluster', 'Cluster agent', 'so_mainframe.png'); +(21, 'Cluster', 'Cluster agent', 'so_cluster.png'); UNLOCK TABLES;