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

Disabled a search filter when using an oracle database

This commit is contained in:
Alejandro Gallardo Escobar 2015-05-04 14:51:06 +02:00
parent 57a9d4615c
commit 3cd0dd60a3
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pandora_console/operation/snmpconsole/snmp_view.php
View File

@ -272,7 +272,8 @@ else if ($trap_type != -1){
$whereSubquery .= ' AND type = ' . $trap_type;
}
if ($group_by) {
// Disable this feature (time will decide if temporarily) in Oracle cause the group by is very confictive
if ($group_by && $config['dbtype'] != 'oracle') {
$where_without_group = $whereSubquery;
$whereSubquery .= ' GROUP BY source,oid';
}
@ -333,12 +334,15 @@ $table->data[4][1] = '<strong>'.__('Trap type').'</strong>' . ui_print_help_tip(
$trap_types = array(-1 => __('None'), 0 => __('Cold start (0)'), 1 => __('Warm start (1)'), 2 => __('Link down (2)'), 3 => __('Link up (3)'), 4 => __('Authentication failure (4)'), 5 => __('Other'));
$table->data[4][2] = html_print_select ($trap_types, 'trap_type', $trap_type, 'this.form.submit();', '', '', true, false, false);
$table->data[3][3] = '<strong>'.__('Group by Enterprise String/IP').'</strong>';
$table->data[3][4] = __('Yes') . '&nbsp;'.
html_print_radio_button ('group_by', 1, '', $group_by, true) .
'&nbsp;&nbsp;';
$table->data[3][4] .= __('No') . '&nbsp;' .
html_print_radio_button ('group_by', 0, '', $group_by, true);
// Disable this feature (time will decide if temporarily) in Oracle cause the group by is very confictive
if ($config['dbtype'] != 'oracle') {
$table->data[3][3] = '<strong>'.__('Group by Enterprise String/IP').'</strong>';
$table->data[3][4] = __('Yes') . '&nbsp;'.
html_print_radio_button ('group_by', 1, '', $group_by, true) .
'&nbsp;&nbsp;';
$table->data[3][4] .= __('No') . '&nbsp;' .
html_print_radio_button ('group_by', 0, '', $group_by, true);
}
$filter = '<form method="POST" action="index.php?' .
'sec=snmpconsole&' .