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

2011-06-20 Sergio Martin <sergio.martin@artica.es> 

* operation/events/events_list.php: Fixed total events query
	used in pagination



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4468 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2011-06-20 09:55:14 +00:00
parent f56c6f6a9b
commit 1544f8136a
2 changed files with 7 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 @@
2011-06-20 Sergio Martin <sergio.martin@artica.es>
* operation/events/events_list.php: Fixed total events query
used in pagination
2011-06-17 Ramon Novoa <rnovoa@artica.es>
* godmode/alerts/alert_actions.php: Aesthetic fix.

5
pandora_console/operation/events/events_list.php
View File

@ -322,11 +322,10 @@ if ($group_rep == 0) {
$sql = "SELECT COUNT(id_evento) FROM tevento WHERE 1=1 ".$sql_post;
}
else {
$sql = "SELECT COUNT(DISTINCT(evento)) FROM tevento WHERE 1=1 ".$sql_post;
$sql = "SELECT COUNT(*) FROM tevento WHERE id_evento IN (SELECT id_evento FROM tevento
WHERE 1=1 $sql_post GROUP BY evento, id_agentmodule)";
}
//Count the events with this filter (TODO but not utimestamp).
$total_events = (int) db_get_sql ($sql);