diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-05-31 07:41:24 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-05-31 07:41:24 +0000 |
| commit | c28d86f5ee7cddfde35cc61daa9a726e2e68509b (patch) | |
| tree | b68d2a0c6f5f3b7071c8062139573fd3d24611a6 /frontends/php/srv_status.php | |
| parent | 4ce0c92b675da5d30bab11464ae51b7bd9b51a1a (diff) | |
| download | zabbix-c28d86f5ee7cddfde35cc61daa9a726e2e68509b.tar.gz zabbix-c28d86f5ee7cddfde35cc61daa9a726e2e68509b.tar.xz zabbix-c28d86f5ee7cddfde35cc61daa9a726e2e68509b.zip | |
- fixed permissions in IT Services (Artem/Eugene)
- fixed adding 'root' to services
git-svn-id: svn://svn.zabbix.com/trunk@4214 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/srv_status.php')
| -rw-r--r-- | frontends/php/srv_status.php | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/frontends/php/srv_status.php b/frontends/php/srv_status.php index 11030d88..0baf5e3f 100644 --- a/frontends/php/srv_status.php +++ b/frontends/php/srv_status.php @@ -66,12 +66,15 @@ 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 '. - ' 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) '. - ' LEFT JOIN services_links sl_p ON s.serviceid = sl_p.servicedownid and sl_p.soft=0 '. + ' s.name as caption, s.algorithm, t.description, 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) '. + ' LEFT JOIN services_links sl_p ON s.serviceid = sl_p.servicedownid and sl_p.soft=0 '. + ' LEFT JOIN functions f ON t.triggerid=f.triggerid '. + ' LEFT JOIN items i ON f.itemid=i.itemid '. ' WHERE '.DBid2nodeid("s.serviceid").'='.$ZBX_CURNODEID. + ' AND (i.hostid is null or i.hostid not in ('.$denyed_hosts.')) '. ' ORDER BY s.sortorder, sl.serviceupid, s.serviceid'; $result=DBSelect($query); @@ -163,6 +166,9 @@ include_once "include/page_header.php"; $treeServ = array(); createShowServiceTree($services,$treeServ); //return into $treeServ parametr + //permission issue + $treeServ = del_empty_nodes($treeServ); + echo '<script src="js/services.js" type="text/javascript"></script>'; $tree = new CTree($treeServ,array('caption' => '<b>'.S_SERVICE.'</b>', |