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

Merge branch 'ent-fix-planned-downtime' into 'develop' 

Fixed problems in planned downtime

See merge request artica/pandorafms!4181
This commit is contained in:
Daniel Rodriguez 2021-06-09 10:49:48 +00:00
parent 2953870e4f 5fcf3eca23
commit 79499204ce
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1015,7 +1015,21 @@ $table->data['module'][1] = "
'', '',
'', '',
0, 0,
true true,
false,
true,
'',
false,
false,
false,
false,
false,
'',
false,
false,
false,
false,
false
)."</td> )."</td>
<td class='datos2 button_cell' style='text-align: right; width:10%;' id=''>".'<div id="add_button_div">'.'<a class="add_button" href="">'.html_print_image( <td class='datos2 button_cell' style='text-align: right; width:10%;' id=''>".'<div id="add_button_div">'.'<a class="add_button" href="">'.html_print_image(
'images/add.png', 'images/add.png',

2
pandora_console/include/ajax/planned_downtime.ajax.php
View File

@ -65,7 +65,7 @@ if ($get_modules_downtime) {
$downtime_module_ids = extract_column($downtime_modules, 'id_agent_module'); $downtime_module_ids = extract_column($downtime_modules, 'id_agent_module');
$downtime_modules = array_fill_keys($downtime_module_ids, true); $downtime_modules = array_fill_keys($downtime_module_ids, true);
$filter = ['id_agente' => $id_agent]; $filter = ['id_agente' => $id_agent, 'delete_pending' => 0];
$modules = db_get_all_rows_filter('tagente_modulo', $filter); $modules = db_get_all_rows_filter('tagente_modulo', $filter);
if (empty($modules)) { if (empty($modules)) {
$modules = []; $modules = [];