diff options
author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-02-15 14:06:26 +0000 |
---|---|---|
committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-02-15 14:06:26 +0000 |
commit | b6ecd0b1c0d40bca9a40ab08ddce2a2fa0aa80bf (patch) | |
tree | 38bb138746c59e28e6a21bea133ba900fbaeabf1 /frontends/php/popup.php | |
parent | b3c8ef909f5494a311e39f89b16d81a4c559f280 (diff) | |
download | zabbix-b6ecd0b1c0d40bca9a40ab08ddce2a2fa0aa80bf.tar.gz zabbix-b6ecd0b1c0d40bca9a40ab08ddce2a2fa0aa80bf.tar.xz zabbix-b6ecd0b1c0d40bca9a40ab08ddce2a2fa0aa80bf.zip |
- added Clone functionality (Eugene)
- more PostgreSQL support
- allow schama generation in any place calling
git-svn-id: svn://svn.zabbix.com/trunk@3831 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/popup.php')
-rw-r--r-- | frontends/php/popup.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/frontends/php/popup.php b/frontends/php/popup.php index 729b2a2e..30ae9c46 100644 --- a/frontends/php/popup.php +++ b/frontends/php/popup.php @@ -544,7 +544,7 @@ function add_template(formname,id,name) S_STATUS)); - $sql = "select h.host,t.*,count(d.triggerid_up) as dep_count ". + $sql = "select h.host,t.triggerid,t.description,t.priority,t.status,count(d.triggerid_up) as dep_count ". " from hosts h,items i,functions f, triggers t left join trigger_depends d on d.triggerid_down=t.triggerid ". " where f.itemid=i.itemid and h.hostid=i.hostid and t.triggerid=f.triggerid". " and ".DBid2nodeid("t.triggerid")."=".$nodeid. @@ -554,7 +554,7 @@ function add_template(formname,id,name) if(isset($hostid)) $sql .= " and h.hostid=$hostid"; - $sql .= " group by h.host, t.triggerid". + $sql .= " group by h.host, t.triggerid, t.description, t.priority, t.status". " order by h.host,t.description"; $result=DBselect($sql); |