diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-07-27 11:02:22 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-07-27 11:02:22 +0000 |
| commit | 0ba1094556cb8f3b8d20fa6b2808242bba76662b (patch) | |
| tree | 5fd840e6249b6195be5b713e1754c402a4c939d5 /frontends/php/include/services.inc.php | |
| parent | de9c9592aff193b555844e82cf06cd3a3967da5b (diff) | |
| download | zabbix-0ba1094556cb8f3b8d20fa6b2808242bba76662b.tar.gz zabbix-0ba1094556cb8f3b8d20fa6b2808242bba76662b.tar.xz zabbix-0ba1094556cb8f3b8d20fa6b2808242bba76662b.zip | |
- merged rev. 4471:4473 of branches/1.4.2/ (Artem) [removed 'Status calculation/Status' column value from node 'root' in IT Services]
git-svn-id: svn://svn.zabbix.com/trunk@4474 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/services.inc.php')
| -rw-r--r-- | frontends/php/include/services.inc.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/frontends/php/include/services.inc.php b/frontends/php/include/services.inc.php index de2a5b5f..b8f6828f 100644 --- a/frontends/php/include/services.inc.php +++ b/frontends/php/include/services.inc.php @@ -636,7 +636,9 @@ $dt = 0; function createServiceTree(&$services,&$temp,$id=0,$serviceupid=0,$parentid=0, $soft=0, $linkid=''){ $rows = $services[$id]; - $rows['algorithm'] = algorithm2str($rows['algorithm']); + if(($rows['serviceid'] > 0) && ($rows['caption'] != 'root')){ + $rows['algorithm'] = algorithm2str($rows['algorithm']); + } //---------------------------- if not leaf ----------------------------- $rows['parentid'] = $parentid; @@ -669,7 +671,9 @@ $dt = 0; //---------------------------- if not leaf ----------------------------- $rows['parentid'] = $parentid; - $rows['status'] = get_service_status_description($rows["status"]); + if(($rows['serviceid'] > 0) && ($rows['caption'] != 'root')){ + $rows['status'] = get_service_status_description($rows["status"]); + } if($soft == 0){ |