- merger rev. 4546:4547 of branches/1.4.j [developed data monitoring of multiple nodes]

git-svn-id: svn://svn.zabbix.com/trunk@4549 97f52cf1-0a1b-0410-bd0e-c28be96e8082

1 files changed, 7 insertions, 4 deletions

diff --git a/frontends/php/overview.php b/frontends/php/overview.php
index e670e73a..eb10bc87 100644
--- a/frontends/php/overview.php
+++ b/frontends/php/overview.php
@@ -76,7 +76,7 @@ include_once "include/page_header.php";
 	
 	$result=DBselect("select distinct g.groupid,g.name from groups g, hosts_groups hg, hosts h, items i".$from.
 		" where g.groupid in (".
-			get_accessible_groups_by_user($USER_DETAILS,PERM_READ_LIST, null, null, $ZBX_CURNODEID).
+			get_accessible_groups_by_user($USER_DETAILS,PERM_READ_LIST, null, null, get_current_nodeid()).
 		") ".
 		" and hg.groupid=g.groupid and h.status=".HOST_STATUS_MONITORED.
 		" and h.hostid=i.hostid and hg.hostid=h.hostid and i.status=".ITEM_STATUS_ACTIVE.
@@ -84,7 +84,10 @@ include_once "include/page_header.php";
 		" order by g.name");
 	while($row=DBfetch($result))
 	{
-		$cmbGroup->AddItem($row["groupid"],$row["name"]);
+		$cmbGroup->AddItem(
+				$row["groupid"],
+				get_node_name_by_elid($row["groupid"]).$row["name"]
+				);
 	}
 	
 	$form->AddItem(array(S_GROUP.SPACE,$cmbGroup));
@@ -130,7 +133,7 @@ include_once "include/page_header.php";
 	if($_REQUEST["type"]==SHOW_DATA)
 	{
 COpt::profiling_start("get_items_data_overview");
-		$table = get_items_data_overview($_REQUEST["groupid"],$ZBX_CURNODEID);
+		$table = get_items_data_overview($_REQUEST["groupid"]);
 COpt::profiling_stop("get_items_data_overview");
 		$table->Show();
 		unset($table);
@@ -138,7 +141,7 @@ COpt::profiling_stop("get_items_data_overview");
 	elseif($_REQUEST["type"]==SHOW_TRIGGERS)
 	{
 COpt::profiling_start("get_triggers_overview");
-		$table = get_triggers_overview($_REQUEST["groupid"], $ZBX_CURNODEID);
+		$table = get_triggers_overview($_REQUEST["groupid"]);
 COpt::profiling_stop("get_triggers_overview");
 		$table->Show();
 		unset($table);