diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-05-29 09:23:08 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-05-29 09:23:08 +0000 |
| commit | bf6f03c29afb2d966898e15a09616002ee435518 (patch) | |
| tree | 66528fa4e4474aabf3f553242cb030d767a45d3c /frontends/php/services.php | |
| parent | b217a4ca56bfe943048a00754bb911d4cb84f1b0 (diff) | |
| download | zabbix-bf6f03c29afb2d966898e15a09616002ee435518.tar.gz zabbix-bf6f03c29afb2d966898e15a09616002ee435518.tar.xz zabbix-bf6f03c29afb2d966898e15a09616002ee435518.zip | |
- more fixes for IT services
git-svn-id: svn://svn.zabbix.com/trunk@4191 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/services.php')
| -rw-r--r-- | frontends/php/services.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/frontends/php/services.php b/frontends/php/services.php index 8d3a2ac0..196044d3 100644 --- a/frontends/php/services.php +++ b/frontends/php/services.php @@ -55,7 +55,7 @@ include_once "include/page_header.php"; //-------------------------------------------------------------------------- $query = 'SELECT distinct s.serviceid, sl.servicedownid, sl_p.serviceupid as serviceupid, - s.name caption, s.algorithm, t.description, s.sortorder, sl.linkid + s.name caption, s.algorithm, t.triggerid, s.sortorder, sl.linkid 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) @@ -82,7 +82,7 @@ $services[0]=$row; while($row = DBFetch($result)){ (empty($row['serviceupid']))?($row['serviceupid']='0'):(''); - (empty($row['description']))?($row['description']='None'):(''); + (empty($row['triggerid']))?($row['description']='None'):($row['description']=expand_trigger_description($row['triggerid'])); if(isset($services[$row['serviceid']])){ @@ -129,4 +129,4 @@ $jsmenu->InsertJavaScript(); include_once "include/page_footer.php"; -?>
\ No newline at end of file +?> |