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

Planned downtime list and edit changed. Ticket #2404

This commit is contained in:
Arturo Gonzalez Diaz 2015-07-14 16:15:04 +02:00
parent ca1c6c0bf2
commit 12334a3cd1
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/godmode/agentes/planned_downtime.editor.php
View File

@ -557,6 +557,14 @@ if ($id_downtime > 0) {
$filter_group = get_parameter("filter_group", 0);
$groupsAW = users_get_groups($config['id_user'], 'AW', true, false, null, 'id_grupo');
$groupsAW = array_keys($groupsAW);
$id_groups_list = implode(",", $groupsAW);
if (empty($id_groups_list)){
$id_groups_list = -1;
}
$filter_cond = '';
if ($filter_group > 0)
$filter_cond = " AND id_grupo = $filter_group ";
@ -569,7 +577,8 @@ if ($id_downtime > 0) {
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);
AND tagente.id_grupo IN (%s)
ORDER by tagente.nombre", $id_downtime, $id_groups_list);
$downtimes = db_get_all_rows_sql ($sql);
$data = array ();
if ($downtimes) {

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

@ -447,6 +447,10 @@ else {
$groupsAW = users_get_groups($config['id_user'], 'AW', true, false, null, 'id_grupo');
$groupsAW = array_keys($groupsAW);
if (empty($groupsAW)){
$groupsAW = -1;
}
foreach ($downtimes as $downtime) {
$data = array();
$total = db_get_sql ("SELECT COUNT(id_agent)