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

2010-08-03 Junichi Satoh <junichi@rworks.jp> 

* godmode/alerts/alert_list.list.php: Fixed a problem alert filtering
	by priority does not work.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3086 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
jsatoh 2010-08-03 02:53:07 +00:00
parent 619b30004f
commit 362e20688c
2 changed files with 8 additions and 3 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 @@
2010-08-03 Junichi Satoh <junichi@rworks.jp>
* godmode/alerts/alert_list.list.php: Fixed a problem alert filtering
by priority does not work.
2010-08-02 Ramon Novoa <rnovoa@artica.es> 2010-08-02 Ramon Novoa <rnovoa@artica.es>
* include/pchart_graph.php, include/fgraph.php: Removed title from * include/pchart_graph.php, include/fgraph.php: Removed title from

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

@ -104,7 +104,7 @@ $where = '';
if ($searchFlag) { if ($searchFlag) {
if ($priority != -1 ) if ($priority != -1 )
$where .= " AND priority = " . $priority; $where .= " AND id_alert_template IN (SELECT id FROM talert_templates WHERE priority = " . $priority . ")";
if (strlen(trim($templateName)) > 0) if (strlen(trim($templateName)) > 0)
$where .= " AND id_alert_template IN (SELECT id FROM talert_templates WHERE name LIKE '%" . trim($templateName) . "%')"; $where .= " AND id_alert_template IN (SELECT id FROM talert_templates WHERE name LIKE '%" . trim($templateName) . "%')";
if (strlen(trim($fieldContent)) > 0) if (strlen(trim($fieldContent)) > 0)
@ -125,7 +125,7 @@ if ($searchFlag) {
$where .= " AND id IN (SELECT id_alert_template_module FROM talert_template_module_actions WHERE id_alert_action = " . $actionID . ")"; $where .= " AND id IN (SELECT id_alert_template_module FROM talert_template_module_actions WHERE id_alert_action = " . $actionID . ")";
} }
$total = get_agent_alerts_simple (array_keys ($agents), array('priority' => $priority), $total = get_agent_alerts_simple (array_keys ($agents), false,
false, $where, false, false, false, true); false, $where, false, false, false, true);
if(empty($total)) $total = 0; if(empty($total)) $total = 0;
@ -220,7 +220,7 @@ switch ($sortField) {
} }
pagination ($total, 'index.php?sec=gagente&sec2=godmode/alerts/alert_list'); pagination ($total, 'index.php?sec=gagente&sec2=godmode/alerts/alert_list');
$simple_alerts = get_agent_alerts_simple (array_keys ($agents), array('priority' => $priority), $simple_alerts = get_agent_alerts_simple (array_keys ($agents), false,
array ('offset' => (int) get_parameter ('offset'), array ('offset' => (int) get_parameter ('offset'),
'limit' => $config['block_size'], 'order' => $order), $where, false); 'limit' => $config['block_size'], 'order' => $order), $where, false);