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

2011-05-06 Junichi Satoh <junichi@rworks.jp> 

* godmode/alerts/alert_list.list.php: Fixed filter parameters are not
	taken over with offset selection.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4310 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
jsatoh 2011-05-06 07:19:59 +00:00
parent 7fff28cea6
commit 9037aaae4e
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2011-05-06 Junichi Satoh <junichi@rworks.jp>
* godmode/alerts/alert_list.list.php: Fixed filter parameters are not
taken over with offset selection.
2011-05-05 Sergio Martin <sergio.martin@artica.es>
* godmode/agentes/configurar_agente.php

10
pandora_console/godmode/alerts/alert_list.list.php
View File

@ -125,7 +125,7 @@ $total = 0;
$where = '';
if ($searchFlag) {
if ($priority != -1 )
if ($priority != -1 && $priority != '')
$where .= " AND id_alert_template IN (SELECT id FROM talert_templates WHERE priority = " . $priority . ")";
if (strlen(trim($templateName)) > 0)
$where .= " AND id_alert_template IN (SELECT id FROM talert_templates WHERE name LIKE '%" . trim($templateName) . "%')";
@ -155,11 +155,11 @@ if ($searchFlag) {
break;
}
}
if ($actionID != -1)
if ($actionID != -1 && $actionID != '')
$where .= " AND talert_template_modules.id IN (SELECT id_alert_template_module FROM talert_template_module_actions WHERE id_alert_action = " . $actionID . ")";
if ($enabledisable != -1)
if ($enabledisable != -1 && $enabledisable != '')
$where .= " AND talert_template_modules.disabled =" . $enabledisable;
if ($standby != -1)
if ($standby != -1 && $standby != '')
$where .= " AND talert_template_modules.standby = " . $standby;
}
@ -279,7 +279,7 @@ if ($id_agente) {
ui_pagination ($total, 'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=alert&id_agente=' . $id_agente);
}
else {
ui_pagination ($total, 'index.php?sec=gagente&sec2=godmode/alerts/alert_list');
ui_pagination ($total, 'index.php?sec=galertas&sec2=godmode/alerts/alert_list&search=1' . '&template_name=' . $templateName . '&agent_name=' . $agentName . '&module_name=' . $moduleName . '&action_id=' . $actionID . '&field_content=' . $fieldContent. '&priority=' . $priority . '&enabledisable=' . $enabledisable . '&standby=' . $standby);
}
$simple_alerts = agents_get_alerts_simple (array_keys ($agents), false,
array ('offset' => (int) get_parameter ('offset'),