diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-08-22 14:01:27 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-08-22 14:01:27 +0000 |
| commit | 674e399c0e58a78d3308df9e345419cf53008144 (patch) | |
| tree | b8ed1eb9e605c27924383783138d873ea9234e3b /frontends/php/srv_status.php | |
| parent | 397cf67462bd88e61cbf6f638854d8787f66c467 (diff) | |
| download | zabbix-674e399c0e58a78d3308df9e345419cf53008144.tar.gz zabbix-674e399c0e58a78d3308df9e345419cf53008144.tar.xz zabbix-674e399c0e58a78d3308df9e345419cf53008144.zip | |
- merged rev. 4636:463t of branches/1.4 (Eugene) [added numeric parameters support for trigger description ' .. ']
git-svn-id: svn://svn.zabbix.com/trunk@4639 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/srv_status.php')
| -rw-r--r-- | frontends/php/srv_status.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/frontends/php/srv_status.php b/frontends/php/srv_status.php index f09b4fef..95459265 100644 --- a/frontends/php/srv_status.php +++ b/frontends/php/srv_status.php @@ -73,7 +73,7 @@ include_once "include/page_header.php"; } else { $query = 'SELECT DISTINCT s.serviceid, sl.servicedownid, sl_p.serviceupid as serviceupid, s.triggerid, '. - ' s.name as caption, s.algorithm, t.description, s.sortorder, sl.linkid, s.showsla, s.goodsla, s.status '. + ' s.name as caption, s.algorithm, t.description, t.expression, s.sortorder, sl.linkid, s.showsla, s.goodsla, s.status '. ' FROM services s '. ' LEFT JOIN triggers t ON s.triggerid = t.triggerid '. ' LEFT JOIN services_links sl ON s.serviceid = sl.serviceupid and NOT(sl.soft=0) '. |