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-8040-Bug-visual-en-item-module-graph-CV' into 'develop' 

Ent 8040 bug visual en item module graph cv

See merge request artica/pandorafms!4455
This commit is contained in:
Daniel Rodriguez 2021-11-15 12:24:02 +00:00
parent d094987eda efd8c8cab2
commit a7b6f885cf
3 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -3772,23 +3772,23 @@ function print_SLA_list($width, $action, $idItem=null)
], ],
] ]
); );
if (!empty($services_tmp) if (!empty($services_tmp)
&& $services_tmp != ENTERPRISE_NOT_HOOK && $services_tmp != ENTERPRISE_NOT_HOOK
) {
foreach ($services_tmp as $service) {
$check_module_sla = modules_check_agentmodule_exists(
$service['sla_id_module']
);
$check_module_sla_value = modules_check_agentmodule_exists(
$service['sla_value_id_module']
);
if ($check_module_sla
&& $check_module_sla_value
) { ) {
foreach ($services_tmp as $service) { $services[$service['id']] = $service['name'];
$check_module_sla = modules_check_agentmodule_exists(
$service['sla_id_module']
);
$check_module_sla_value = modules_check_agentmodule_exists(
$service['sla_value_id_module']
);
if ($check_module_sla
&& $check_module_sla_value
) {
$services[$service['id']] = $service['name'];
}
}
} }
}
}
echo '<td class="sla_list_service_col">'; echo '<td class="sla_list_service_col">';
echo html_print_select( echo html_print_select(

6
pandora_console/godmode/reporting/visual_console_builder.php
View File

@ -459,13 +459,17 @@ switch ($activeTab) {
break; break;
case MODULE_GRAPH:
case SIMPLE_VALUE_MAX: case SIMPLE_VALUE_MAX:
case SIMPLE_VALUE_MIN: case SIMPLE_VALUE_MIN:
case SIMPLE_VALUE_AVG: case SIMPLE_VALUE_AVG:
$values['period'] = get_parameter('period_'.$id, 0); $values['period'] = get_parameter('period_'.$id, 0);
break; break;
case MODULE_GRAPH:
$values['period'] = get_parameter('period_'.$id, 0);
unset($values['image']);
break;
case GROUP_ITEM: case GROUP_ITEM:
$values['id_group'] = get_parameter('group_'.$id, 0); $values['id_group'] = get_parameter('group_'.$id, 0);
break; break;

14
pandora_console/operation/users/user_edit.php
View File

@ -549,13 +549,13 @@ $table_ichanges = '<div class="autorefresh_select">
</div> </div>
<div class="autorefresh_select_arrows" style="display:grid"> <div class="autorefresh_select_arrows" style="display:grid">
<a href="javascript:">'.html_print_image( <a href="javascript:">'.html_print_image(
'images/darrowright_green.png', 'images/darrowright_green.png',
true, true,
[ [
'id' => 'right_autorefreshlist', 'id' => 'right_autorefreshlist',
'alt' => __('Push selected pages into autorefresh list'), 'alt' => __('Push selected pages into autorefresh list'),
'title' => __('Push selected pages into autorefresh list'), 'title' => __('Push selected pages into autorefresh list'),
] ]
).'</a> ).'</a>
<a href="javascript:">'.html_print_image( <a href="javascript:">'.html_print_image(
'images/darrowleft_green.png', 'images/darrowleft_green.png',