- status of triggers changes if host/item status has been changed (Alexei)

 - status of triggers is set correctly even if zabbix is restarted (Alexei)


git-svn-id: svn://svn.zabbix.com/trunk@412 97f52cf1-0a1b-0410-bd0e-c28be96e8082

1 files changed, 2 insertions, 2 deletions

diff --git a/frontends/php/report2.php b/frontends/php/report2.php
index 19c9a974..a27a5970 100644
--- a/frontends/php/report2.php
+++ b/frontends/php/report2.php
@@ -26,7 +26,7 @@
 
 <?
 
-	$result=DBselect("select h.hostid,h.host,t.triggerid,t.expression,t.description,t.istrue from triggers t,hosts h,items i,functions f where f.itemid=i.itemid and h.hostid=i.hostid and t.istrue!=2 and t.triggerid=f.triggerid and h.status in (0,2) and i.status=0 order by h.host,t.lastchange desc, t.description");
+	$result=DBselect("select h.hostid,h.host,t.triggerid,t.expression,t.description,t.value from triggers t,hosts h,items i,functions f where f.itemid=i.itemid and h.hostid=i.hostid and t.status=0 and t.triggerid=f.triggerid and h.status in (0,2) and i.status=0 order by h.host,t.lastchange desc, t.description");
 
 	$lasthost="";
 	$col=0;
@@ -53,7 +53,7 @@
 	        if($col++%2 == 1)	{ echo "<TR BGCOLOR=#DDDDDD>"; }
 		else			{ echo "<TR BGCOLOR=#EEEEEE>"; }
 
-		echo "<TD>".$row["description"]."</TD>";
+		echo "<TD><a href=\"alarms.php?triggerid=".$row["triggerid"]."\">".$row["description"]."</a></TD>";
 		$description=rawurlencode($row["description"]);
 
 		echo "<TD>".explode_exp($row["expression"],1)."</TD>";