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/include/services.inc.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/include/services.inc.php')
| -rw-r--r-- | frontends/php/include/services.inc.php | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/frontends/php/include/services.inc.php b/frontends/php/include/services.inc.php index 1cce729c..b54eb79b 100644 --- a/frontends/php/include/services.inc.php +++ b/frontends/php/include/services.inc.php @@ -588,7 +588,9 @@ $dt = 0; if(!isset($services[$nodeid['id']])){ continue; } - createServiceTree($services,$temp,$nodeid['id'],$services[$nodeid['id']]['serviceupid'],$rows['serviceid'],$nodeid['soft'], $nodeid['linkid']); + if(isset($services[$nodeid['id']]['serviceupid'])){ + createServiceTree($services,$temp,$nodeid['id'],$services[$nodeid['id']]['serviceupid'],$rows['serviceid'],$nodeid['soft'], $nodeid['linkid']); + } } } } else { @@ -616,7 +618,8 @@ $dt = 0; if(!isset($services[$nodeid['id']])){ continue; } - createShowServiceTree($services,$temp,$nodeid['id'],$services[$nodeid['id']]['serviceupid'],$rows['serviceid'],$nodeid['soft'], $nodeid['linkid']); + if(isset($services[$nodeid['id']]['serviceupid'])){ + createShowServiceTree($services,$temp,$nodeid['id'],$services[$nodeid['id']]['serviceupid'],$rows['serviceid'],$nodeid['soft'], $nodeid['linkid']); } } } } else { @@ -628,7 +631,20 @@ $dt = 0; } function closeform(){ - zbx_add_post_js('closeform();'); } + + function del_empty_nodes($services){ + do{ + unset($retry); + foreach($services as $id => $data){ + if(isset($data['serviceupid']) && !isset($services[$data['serviceupid']])){ + unset($services[$id]); + $retry = true; + //break; + } + } + } while(isset($retry)); + return $services; + } ?> |