diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-05-23 14:14:26 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-05-23 14:14:26 +0000 |
| commit | 95b1fa4071d6dba096c9fe435db9ecd8dcb85752 (patch) | |
| tree | 7bf2de98b8b34fd2aa59d4a2304143d1fec8f15d /frontends/php/include/items.inc.php | |
| parent | 026ee8a0f799dc8faec5bf4ce591746d06795b23 (diff) | |
| download | zabbix-95b1fa4071d6dba096c9fe435db9ecd8dcb85752.tar.gz zabbix-95b1fa4071d6dba096c9fe435db9ecd8dcb85752.tar.xz zabbix-95b1fa4071d6dba096c9fe435db9ecd8dcb85752.zip | |
- fixed items grouping of Data overview screen (Eugene)
git-svn-id: svn://svn.zabbix.com/trunk@2885 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/items.inc.php')
| -rw-r--r-- | frontends/php/include/items.inc.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/frontends/php/include/items.inc.php b/frontends/php/include/items.inc.php index 4d980fcd..202e2b3d 100644 --- a/frontends/php/include/items.inc.php +++ b/frontends/php/include/items.inc.php @@ -541,7 +541,7 @@ } COpt::profiling_start('prepare data'); - $result = DBselect('select distinct h.hostid, h.host,i.itemid, i.value_type, i.lastvalue, i.units, i.description'. + $result = DBselect('select distinct h.hostid, h.host,i.itemid, i.key_, i.value_type, i.lastvalue, i.units, i.description'. ' from hosts h,items i '.$group_where. ' h.status='.HOST_STATUS_MONITORED.' and h.hostid=i.hostid and i.status='.ITEM_STATUS_ACTIVE. ' order by i.description'); @@ -568,7 +568,7 @@ COpt::profiling_start('prepare data'); if($access == 0) continue; $hosts[$row['host']] = $row['host']; - $items[$row['description']][$row['host']] = array( + $items[item_description($row["description"],$row["key_"])][$row['host']] = array( 'itemid' => $row['itemid'], 'value_type' => $row['value_type'], 'lastvalue' => $row['lastvalue'], |