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

Ending creator wizard, fix cluster list, change data modules on update - #1748

This commit is contained in:
enriquecd 2018-01-29 19:15:28 +01:00
parent 13884a44d6
commit f83e093091
6 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/general/firts_task/cluster_builder.php
View File

@ -25,7 +25,7 @@ ui_print_info_message ( array('no_close'=>true, 'message'=> __('There are no cl
<div class="new_task"> <div class="new_task">
<div class="image_task"> <div class="image_task">
<?php echo html_print_image('images/firts_task/icono_grande_custom_reporting.png', true, array("title" => __('Clusters')));?> <?php echo html_print_image('images/firts_task/icono-cluster-activo.png', true, array("title" => __('Clusters')));?>
</div> </div>
<div class="text_task"> <div class="text_task">
<h3> <?php echo __('Create Cluster'); ?></h3> <h3> <?php echo __('Create Cluster'); ?></h3>

8
pandora_console/godmode/reporting/cluster_builder.main.php
View File

@ -250,13 +250,9 @@ elseif($step == 2){
$cluster_agents_all[$value['id_agente']] = $value['alias']; $cluster_agents_all[$value['id_agente']] = $value['alias'];
} }
$cluster_agents_out = array(); $cluster_agents_out = array_diff_key($cluster_agents_all,$cluster_agents_in);
$cluster_agents_out = array_diff_key($template_agents_all, $template_agents_in);
$cluster_agents_in_keys = array_keys($template_agents_in); html_print_select ($cluster_agents_out, 'id_agents[]', 0, false, '', '', false, true, true, '', false, 'width: 100%;', $option_style);
$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);
echo "</td>"; echo "</td>";

5
pandora_console/godmode/reporting/cluster_list.php
View File

@ -77,8 +77,7 @@ ui_pagination (count($clusters));
foreach ($clusters as $cluster) { foreach ($clusters as $cluster) {
$data = array (); $data = array ();
$data[0] = '<a href="index.php?sec=reporting&sec2=godmode/reporting/cluster_view&id='.$cluster["id"].'">'.$cluster["name"].' - Enlace Map Dani (Mapa de red)</a><br><br>'. $data[0] = '<a href="index.php?sec=reporting&sec2=godmode/reporting/cluster_view&id='.$cluster["id"].'">'.$cluster["name"].'</a>';
'<a href="index.php?sec=reporting&sec2=godmode/reporting/cluster_view_2&id='.$cluster["id"].'">'.$cluster["name"].' - Enlace Enrique (pantalla informativa)</a>';
$data[1] = ui_print_truncate_text($cluster["description"], 70); $data[1] = ui_print_truncate_text($cluster["description"], 70);
$data[2] = ui_print_group_icon($cluster['group'],true); $data[2] = ui_print_group_icon($cluster['group'],true);
@ -143,7 +142,7 @@ ui_pagination (count($clusters));
break; break;
} }
$data[6] = "<a href='index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&delete_cluster=".$cluster["id"]."'><img src='images/cross.png'></a> $data[6] = "<a href='index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&delete_cluster=".$cluster["id"]."' onclick='javascript: if (!confirm(\"Are you sure to delete?\")) return false;'><img src='images/cross.png'></a>
<a href='index.php?sec=reporting&sec2=godmode/reporting/cluster_builder.cluster_editor&id=".$cluster["id"]."'><img src='images/builder.png'></a>"; <a href='index.php?sec=reporting&sec2=godmode/reporting/cluster_builder.cluster_editor&id=".$cluster["id"]."'><img src='images/builder.png'></a>";
array_push ($table->data, $data); array_push ($table->data, $data);

BIN
pandora_console/images/firts_task/icono-cluster-activo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
pandora_console/images/os_icons/so_cluster.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 850 B

2
pandora_console/pandoradb_data.sql
View File

@ -142,7 +142,7 @@ INSERT INTO `tconfig_os` (`id_os`, `name`, `description`, `icon_name`) VALUES
(18, 'Switch', 'Generic switch', 'so_switch.png'), (18, 'Switch', 'Generic switch', 'so_switch.png'),
(19, 'Satellite', 'Satellite agent', 'satellite.png'), (19, 'Satellite', 'Satellite agent', 'satellite.png'),
(20, 'Mainframe', 'Mainframe agent', 'so_mainframe.png'), (20, 'Mainframe', 'Mainframe agent', 'so_mainframe.png'),
(21, 'Cluster', 'Cluster agent', 'so_mainframe.png'); (21, 'Cluster', 'Cluster agent', 'so_cluster.png');
UNLOCK TABLES; UNLOCK TABLES;