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

Fix bugs view and wizard - #1748

This commit is contained in:
enriquecd 2018-01-31 15:39:06 +01:00
parent f9edfcb893
commit ee4db9b01b
4 changed files with 50 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,10 +32,10 @@ else
echo '<li class="first">'; echo '<li class="first">';
if ($step > 1 && !$update) { if ($step > 1 && !$update) {
echo '<a href="index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&id_cluster='.$id_cluster.'&step=1">';
echo __('Step') . ' 1 &raquo; '; echo __('Step') . ' 1 &raquo; ';
echo '<span>' . __('Cluster settings') . '</span>'; echo '<span>' . __('Cluster settings') . '</span>';
echo '</a>';
} }
elseif ($update) { elseif ($update) {
echo '<a href="index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&id_cluster='.$id_cluster.'&step=1&update=1">'; echo '<a href="index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&id_cluster='.$id_cluster.'&step=1&update=1">';
@ -481,7 +481,17 @@ elseif ($step == 4) {
echo "<td class='datos'>".$value."</td>"; echo "<td class='datos'>".$value."</td>";
echo "<td class='datos'><input class='zero_hundred' value='".get_item_critical_limit_by_item_id($key)."' name='critical_item_".$key."' type='number' max='100' min='0' style='width:60%;' onkeydown='javascript: return event.keyCode == 69 ? false : true'> &nbsp;&nbsp;% are down</td>"; echo "<td class='datos'><input class='zero_hundred' value='".get_item_critical_limit_by_item_id($key)."' name='critical_item_".$key."' type='number' max='100' min='0' style='width:60%;' onkeydown='javascript: return event.keyCode == 69 ? false : true'> &nbsp;&nbsp;% are down</td>";
echo "<td class='datos'><input class='zero_hundred' value='".get_item_warning_limit_by_item_id($key)."' name='warning_item_".$key."' type='number' max='100' min='0' style='width:60%;' onkeydown='javascript: return event.keyCode == 69 ? false : true'> &nbsp;&nbsp;% are down</td>"; echo "<td class='datos'><input class='zero_hundred' value='".get_item_warning_limit_by_item_id($key)."' name='warning_item_".$key."' type='number' max='100' min='0' style='width:60%;' onkeydown='javascript: return event.keyCode == 69 ? false : true'> &nbsp;&nbsp;% are down</td>";
echo "<td class='datos'><a href='index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&delete_module_aa=".$key."&id_cluster=".$id_cluster."'><img src='images/cross.png'></a></td>"; echo "<td class='datos'>";
if(!$update){
echo "<a href='index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&delete_module_aa=".$key."&id_cluster=".$id_cluster."'>";
}
else{
echo "<a href='index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&delete_module_aa=".$key."&id_cluster=".$id_cluster."&update=1'>";
}
echo "<img src='images/cross.png'></a></td>";
echo "</tr>"; echo "</tr>";
} }
@ -653,7 +663,14 @@ elseif ($step == 6) {
echo "<td class='datos'><input class='is_critical_check' name='is_critical_item_".$key."' type='checkbox' value='1'></td>"; echo "<td class='datos'><input class='is_critical_check' name='is_critical_item_".$key."' type='checkbox' value='1'></td>";
} }
if(!$update){
echo "<td class='datos'><a href='index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&delete_module_ap=".$key."&id_cluster=".$id_cluster."'><img src='images/cross.png'></a></td>"; echo "<td class='datos'><a href='index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&delete_module_ap=".$key."&id_cluster=".$id_cluster."'><img src='images/cross.png'></a></td>";
}
else{
echo "<td class='datos'><a href='index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&delete_module_ap=".$key."&id_cluster=".$id_cluster."&update=1'><img src='images/cross.png'></a></td>";
}
echo "</tr>"; echo "</tr>";
} }

13
pandora_console/godmode/reporting/cluster_builder.php
View File

@ -540,7 +540,14 @@ elseif ($step == 3) {
$delete_item = db_process_sql('delete from tcluster_item where id = '.$delete_module_aa); $delete_item = db_process_sql('delete from tcluster_item where id = '.$delete_module_aa);
if(!$update){
header ("Location: index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&step=4&id_cluster=".$id_cluster); header ("Location: index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&step=4&id_cluster=".$id_cluster);
}
else{
header ("Location: index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&step=4&id_cluster=".$id_cluster."&update=1");
}
} }
elseif($delete_module_ap){ elseif($delete_module_ap){
@ -550,8 +557,14 @@ elseif ($step == 3) {
$delete_item = db_process_sql('delete from tcluster_item where id = '.$delete_module_ap); $delete_item = db_process_sql('delete from tcluster_item where id = '.$delete_module_ap);
if(!$update){
header ("Location: index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&step=6&id_cluster=".$id_cluster); header ("Location: index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&step=6&id_cluster=".$id_cluster);
} }
else{
header ("Location: index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&step=6&id_cluster=".$id_cluster."&update=1");
}
}
$active_tab = get_parameter('tab', 'main'); $active_tab = get_parameter('tab', 'main');

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

@ -51,16 +51,16 @@ ui_pagination (count($clusters));
$table->head[4] = __('Nodes') . ' ' . $table->head[4] = __('Nodes') . ' ' .
'<a href="index.php?sec=estado&sec2=enterprise/operation/cluster/cluster&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=name&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectNameUp, "alt" => "up")) . '</a>' . '<a href="index.php?sec=estado&sec2=enterprise/operation/cluster/cluster&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=nodes&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectNameUp, "alt" => "up")) . '</a>' .
'<a href="index.php?sec=estado&sec2=enterprise/operation/cluster/cluster&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=name&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectNameDown, "alt" => "down")) . '</a>'; '<a href="index.php?sec=estado&sec2=enterprise/operation/cluster/cluster&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=nodes&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectNameDown, "alt" => "down")) . '</a>';
$table->head[5] = __('Status') . ' ' . $table->head[5] = __('Status') . ' ' .
'<a href="index.php?sec=estado&sec2=enterprise/operation/cluster/cluster&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=name&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectNameUp, "alt" => "up")) . '</a>' . '<a href="index.php?sec=estado&sec2=enterprise/operation/cluster/cluster&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=status&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectNameUp, "alt" => "up")) . '</a>' .
'<a href="index.php?sec=estado&sec2=enterprise/operation/cluster/cluster&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=name&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectNameDown, "alt" => "down")) . '</a>'; '<a href="index.php?sec=estado&sec2=enterprise/operation/cluster/cluster&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=status&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectNameDown, "alt" => "down")) . '</a>';
$table->head[6] = __('Actions') . ' ' . $table->head[6] = __('Actions') . ' ' .
'<a href="index.php?sec=estado&sec2=enterprise/operation/cluster/cluster&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=actions&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectNameUp, "alt" => "up")) . '</a>' . '<a href="index.php?sec=estado&sec2=enterprise/operation/cluster/cluster&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=actions&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectNameUp, "alt" => "up")) . '</a>' .
'<a href="index.php?sec=estado&sec2=enterprise/operation/cluster/cluster&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=action&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectNameDown, "alt" => "down")) . '</a>'; '<a href="index.php?sec=estado&sec2=enterprise/operation/cluster/cluster&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=actions&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectNameDown, "alt" => "down")) . '</a>';
$table->size[0] = '25%'; $table->size[0] = '25%';
$table->size[1] = '25%'; $table->size[1] = '25%';

9
pandora_console/godmode/reporting/cluster_view.php
View File

@ -402,9 +402,18 @@ function pagination_list_modules() {
$("#module_list").empty(); $("#module_list").empty();
$("#module_list").html(data); $("#module_list").html(data);
//hide filters
$('.forced_title[alt=Force]').css('display','none'); $('.forced_title[alt=Force]').css('display','none');
$('.header a').css('display','none');
//hide filters
} }
}); });
} }
$("a.tag_details").cluetip ({ $("a.tag_details").cluetip ({