From a726a2aa05732a99785590aa5d5ec4fc1d0e4f75 Mon Sep 17 00:00:00 2001 From: ramonn Date: Thu, 12 Sep 2013 12:36:30 +0000 Subject: [PATCH] 2013-09-12 Ramon Novoa * godmode/snmpconsole/snmp_alert.php: Fixed pagination (was not working well when a search filter was being used). * godmode/netflow/nf_edit_form.php: Force the ID of the table (the javascript was broken). git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8763 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 8 ++++++++ pandora_console/godmode/netflow/nf_edit_form.php | 1 + pandora_console/godmode/snmpconsole/snmp_alert.php | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 36e035cbbc..71f358b3ff 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2013-09-12 Ramon Novoa + + * godmode/snmpconsole/snmp_alert.php: Fixed pagination (was not working + well when a search filter was being used). + + * godmode/netflow/nf_edit_form.php: Force the ID of the table (the + javascript was broken). + 2013-09-12 Ramon Novoa * include/functions_config.php: Removed some code that set diff --git a/pandora_console/godmode/netflow/nf_edit_form.php b/pandora_console/godmode/netflow/nf_edit_form.php index cddc999ecb..7bc1ec4b99 100644 --- a/pandora_console/godmode/netflow/nf_edit_form.php +++ b/pandora_console/godmode/netflow/nf_edit_form.php @@ -164,6 +164,7 @@ if ($create) { } } +$table->id = 'table1'; $table->width = '80%'; $table->border = 0; $table->cellspacing = 3; diff --git a/pandora_console/godmode/snmpconsole/snmp_alert.php b/pandora_console/godmode/snmpconsole/snmp_alert.php index add33dd31b..d6e6b4aabc 100644 --- a/pandora_console/godmode/snmpconsole/snmp_alert.php +++ b/pandora_console/godmode/snmpconsole/snmp_alert.php @@ -597,7 +597,7 @@ else { $url_pagination = "index.php?" . "sec=snmpconsole&" . "sec2=godmode/snmpconsole/snmp_alert&" . - "free_seach=" . $free_search . "&" . + "free_search=" . $free_search . "&" . "trap_type_filter=" . $trap_type_filter . "&" . "priority_filter=" . $priority_filter; } @@ -605,7 +605,7 @@ else { $url_pagination = "index.php?" . "sec=snmpconsole&" . "sec2=godmode/snmpconsole/snmp_alert&" . - "free_seach=" . $free_search . "&" . + "free_search=" . $free_search . "&" . "trap_type_filter=" . $trap_type_filter . "&" . "priority_filter=" . $priority_filter . "&" . "offset=" . $offset;