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

Fixed the error that caused the create button dissapeared under certain circunstances 

(When no downtimes was retrieved)

TICKET #2580
This commit is contained in:
Alejandro Gallardo Escobar 2015-08-05 14:38:07 +02:00
parent b01934e00a
commit cc6d0932a3
1 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
pandora_console/godmode/agentes/planned_downtime.list.php
View File

@ -177,6 +177,9 @@ $row[] = html_print_submit_button('Search', 'search', false, 'class="sub search"
$table_form->data[] = $row; $table_form->data[] = $row;
// End of table filter // End of table filter
// Useful to know if the user has done a form filtering
$filter_performed = false;
$groups = users_get_groups (); $groups = users_get_groups ();
if (!empty($groups)) { if (!empty($groups)) {
$where_values = "1=1"; $where_values = "1=1";
@ -184,19 +187,29 @@ if (!empty($groups)) {
$groups_string = implode (",", array_keys ($groups)); $groups_string = implode (",", array_keys ($groups));
$where_values .= " AND id_group IN ($groups_string)"; $where_values .= " AND id_group IN ($groups_string)";
// WARNING: add $filter_performed = true; to any future filter
if (!empty($search_text)) { if (!empty($search_text)) {
$filter_performed = true;
$where_values .= " AND (name LIKE '%$search_text%' OR description LIKE '%$search_text%')"; $where_values .= " AND (name LIKE '%$search_text%' OR description LIKE '%$search_text%')";
} }
if (!empty($execution_type)) { if (!empty($execution_type)) {
$filter_performed = true;
$where_values .= " AND type_execution = '$execution_type'"; $where_values .= " AND type_execution = '$execution_type'";
} }
if (!empty($date_from)) { if (!empty($date_from)) {
$filter_performed = true;
$where_values .= " AND (type_execution = 'periodically' OR (type_execution = 'once' AND date_from >= '".strtotime("$date_from 00:00:00")."'))"; $where_values .= " AND (type_execution = 'periodically' OR (type_execution = 'once' AND date_from >= '".strtotime("$date_from 00:00:00")."'))";
} }
if (!empty($date_to)) { if (!empty($date_to)) {
$filter_performed = true;
$periodically_monthly_w = "type_periodicity = 'monthly' $periodically_monthly_w = "type_periodicity = 'monthly'
AND ((periodically_day_from <= '".date('d', strtotime($date_from))."' AND periodically_day_to >= '".date('d', strtotime($date_to))."') AND ((periodically_day_from <= '".date('d', strtotime($date_from))."' AND periodically_day_to >= '".date('d', strtotime($date_to))."')
OR (periodically_day_from > periodically_day_to OR (periodically_day_from > periodically_day_to
@ -226,14 +239,20 @@ if (!empty($groups)) {
} }
if (!$show_archived) { if (!$show_archived) {
$filter_performed = true;
$where_values .= " AND (type_execution = 'periodically' OR (type_execution = 'once' AND date_to >= '".time()."'))"; $where_values .= " AND (type_execution = 'periodically' OR (type_execution = 'once' AND date_to >= '".time()."'))";
} }
if (!empty($agent_id)) { if (!empty($agent_id)) {
$filter_performed = true;
$where_values .= " AND id IN (SELECT id_downtime FROM tplanned_downtime_agents WHERE id_agent = $agent_id)"; $where_values .= " AND id IN (SELECT id_downtime FROM tplanned_downtime_agents WHERE id_agent = $agent_id)";
} }
if (!empty($module_id)) { if (!empty($module_id)) {
$filter_performed = true;
$where_values .= " AND (id IN (SELECT id_downtime $where_values .= " AND (id IN (SELECT id_downtime
FROM tplanned_downtime_modules FROM tplanned_downtime_modules
WHERE id_agent_module = $module_id) WHERE id_agent_module = $module_id)
@ -322,9 +341,33 @@ else {
$downtimes = array(); $downtimes = array();
} }
if (!$downtimes) { // No downtimes cause the user has not anyone
if (!$downtimes && !$filter_performed) {
require_once ($config['homedir'] . "/general/firts_task/planned_downtime.php"); require_once ($config['homedir'] . "/general/firts_task/planned_downtime.php");
} }
// No downtimes cause the user performed a search
else if (!$downtimes) {
// Filter form
echo "<form method='post' action='index.php?sec=estado&sec2=godmode/agentes/planned_downtime.list'>";
html_print_table($table_form);
echo "</form>";
// Info message
echo '<div class="nf">'.__('No planned downtime').'</div>';
echo '<div class="action-buttons" style="width: 100%">';
// Create button
if ($write_permisson) {
echo '&nbsp;';
echo '<form method="post" action="index.php?sec=estado&amp;sec2=godmode/agentes/planned_downtime.editor" style="display: inline;">';
html_print_submit_button (__('Create'), 'create', false, 'class="sub next"');
echo '</form>';
}
echo '</div>';
}
// Has downtimes
else { else {
echo "<form method='post' action='index.php?sec=estado&sec2=godmode/agentes/planned_downtime.list'>"; echo "<form method='post' action='index.php?sec=estado&sec2=godmode/agentes/planned_downtime.list'>";
html_print_table($table_form); html_print_table($table_form);