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

2009-12-23 Miguel de Dios <miguel.dedios@artica.es> 

* godmode/agentes/planned_downtime.php: fixes bug in several fields of
	edit form downtime.
	Fixes: 2919938



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2236 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2009-12-23 13:19:08 +00:00
parent c8273efad4
commit 4e152c38c7
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2009-12-23 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/planned_downtime.php: fixes bug in several fields of
edit form downtime.
Fixes: 2919938
2009-12-23 Sancho Lerena <slerena@artica.es> 2009-12-23 Sancho Lerena <slerena@artica.es>
* include/config_process.php: Updated build. * include/config_process.php: Updated build.

14
pandora_console/godmode/agentes/planned_downtime.php
View File

@ -124,7 +124,7 @@ echo __('Planned Downtime').'</h2>';
if (($first_create != 0) OR ($first_update != 0)){ if (($first_create != 0) OR ($first_update != 0)){
// Have any data to show ? // Have any data to show ?
if ($id_downtime > 0) { if ($id_downtime > 0) {
$sql = sprintf ("SELECT `id`, `name`, `description`, `date_from`, `date_to` $sql = sprintf ("SELECT `id`, `name`, `description`, `date_from`, `date_to`, `id_group`
FROM `tplanned_downtime` WHERE `id` = %d", FROM `tplanned_downtime` WHERE `id` = %d",
$id_downtime); $id_downtime);
@ -133,8 +133,10 @@ echo __('Planned Downtime').'</h2>';
$description = $result["description"]; $description = $result["description"];
$date_from = strftime ('%Y-%m-%d', $result["date_from"]); $date_from = strftime ('%Y-%m-%d', $result["date_from"]);
$date_to = strftime ('%Y-%m-%d', $result["date_to"]); $date_to = strftime ('%Y-%m-%d', $result["date_to"]);
if ($id_group == 1)
$id_group = $result['id_group'];
} }
$table->class = 'databox_color'; $table->class = 'databox_color';
$table->width = '90%'; $table->width = '90%';
@ -183,12 +185,8 @@ echo __('Planned Downtime').'</h2>';
// Show available agents to include into downtime // Show available agents to include into downtime
echo '<h3>'.__('Available agents').':</h3>'; echo '<h3>'.__('Available agents').':</h3>';
$filter_group = get_parameter("filter_group", $result['id_group']);
$filter_group = get_parameter("filter_group", 1); $filter_cond = " AND id_grupo = $filter_group ";
if ($filter_group != 1)
$filter_cond = " AND id_grupo = $filter_group ";
else
$filter_cond = "";
$sql = sprintf ("SELECT tagente.id_agente, tagente.nombre, tagente.id_grupo FROM tagente WHERE tagente.id_agente NOT IN (SELECT tagente.id_agente FROM tagente, tplanned_downtime_agents WHERE tplanned_downtime_agents.id_agent = tagente.id_agente AND tplanned_downtime_agents.id_downtime = %d) AND disabled = 0 $filter_cond ORDER by tagente.nombre", $id_downtime); $sql = sprintf ("SELECT tagente.id_agente, tagente.nombre, tagente.id_grupo FROM tagente WHERE tagente.id_agente NOT IN (SELECT tagente.id_agente FROM tagente, tplanned_downtime_agents WHERE tplanned_downtime_agents.id_agent = tagente.id_agente AND tplanned_downtime_agents.id_downtime = %d) AND disabled = 0 $filter_cond ORDER by tagente.nombre", $id_downtime);
$downtimes = get_db_all_rows_sql ($sql); $downtimes = get_db_all_rows_sql ($sql);
$data = array (); $data = array ();