summaryrefslogtreecommitdiffstats
path: root/frontends
diff options
context:
space:
mode:
authorsasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-08-05 12:17:58 +0000
committersasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-08-05 12:17:58 +0000
commit880d2fcdfaa1b8e5ba6db8365dc0b6de22bc0b93 (patch)
tree50e591f039970788be9bbd5d6db3960a971a8555 /frontends
parent31d9eeed8ba49cac9b2b9ebb3d1c77558df5ff0f (diff)
downloadzabbix-880d2fcdfaa1b8e5ba6db8365dc0b6de22bc0b93.tar.gz
zabbix-880d2fcdfaa1b8e5ba6db8365dc0b6de22bc0b93.tar.xz
zabbix-880d2fcdfaa1b8e5ba6db8365dc0b6de22bc0b93.zip
- [DEV-198] Correct representation of disabled elements on the map (hosts, triggers)
git-svn-id: svn://svn.zabbix.com/trunk@5871 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends')
-rw-r--r--frontends/php/include/maps.inc.php4
-rw-r--r--frontends/php/maps.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/frontends/php/include/maps.inc.php b/frontends/php/include/maps.inc.php
index 5e0dfc6b..e54c6e68 100644
--- a/frontends/php/include/maps.inc.php
+++ b/frontends/php/include/maps.inc.php
@@ -94,7 +94,7 @@
}
break;
case SYSMAP_ELEMENT_TYPE_MAP:
- $result = sysmap_accessible($se_data['elementid'], PERM_READ_ONLY);
+ $result = sysmap_accessible($se_data['elementid'], $perm);
break;
case SYSMAP_ELEMENT_TYPE_TRIGGER:
$available_triggers = get_accessible_triggers($perm, PERM_RES_IDS_ARRAY);
@@ -103,7 +103,7 @@
}
break;
case SYSMAP_ELEMENT_TYPE_HOST_GROUP:
- $available_groups = get_accessible_groups_by_user($USER_DETAILS,$perm);
+ $available_groups = get_accessible_groups_by_user($USER_DETAILS,$perm,PERM_RES_IDS_ARRAY);
if(!uint_in_array($se_data['elementid'],$available_groups)){
$result = false;
}
diff --git a/frontends/php/maps.php b/frontends/php/maps.php
index 34a1f6c3..aa3699b6 100644
--- a/frontends/php/maps.php
+++ b/frontends/php/maps.php
@@ -192,4 +192,4 @@ include_once('include/page_header.php');
include_once "include/page_footer.php";
-?> \ No newline at end of file
+?>