diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-06-18 12:32:02 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-06-18 12:32:02 +0000 |
| commit | 4f1f420a91e557c2ab4a7ff9605fba260931bbdc (patch) | |
| tree | 48ff179492d1d1ae1d93061ec618392d281fef3a /frontends/php/popup_right.php | |
| parent | 01e94d67317be183b74fa97bd3d15ee99ab27d69 (diff) | |
| download | zabbix-4f1f420a91e557c2ab4a7ff9605fba260931bbdc.tar.gz zabbix-4f1f420a91e557c2ab4a7ff9605fba260931bbdc.tar.xz zabbix-4f1f420a91e557c2ab4a7ff9605fba260931bbdc.zip | |
- [DEV-171] improvements to escalation form (Artem)
- [DEV-137] small fixes (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5778 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/popup_right.php')
| -rw-r--r-- | frontends/php/popup_right.php | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/frontends/php/popup_right.php b/frontends/php/popup_right.php index c4420390..ff403f5e 100644 --- a/frontends/php/popup_right.php +++ b/frontends/php/popup_right.php @@ -34,7 +34,7 @@ include_once "include/page_header.php"; $fields=array( "dstfrm"=> array(T_ZBX_STR, O_MAND,P_SYS, NOT_EMPTY, NULL), "permission"=> array(T_ZBX_INT, O_MAND,P_SYS, IN(PERM_DENY.','.PERM_READ_ONLY.','.PERM_READ_WRITE), NULL), - "type"=> array(T_ZBX_INT, O_OPT, P_SYS, IN(RESOURCE_TYPE_GROUP.(ZBX_DISTRIBUTED ? ','.RESOURCE_TYPE_NODE : '')), NULL), +// "type"=> array(T_ZBX_INT, O_OPT, P_SYS, IN(RESOURCE_TYPE_GROUP.(ZBX_DISTRIBUTED ? ','.RESOURCE_TYPE_NODE : '')), NULL), 'nodeid'=> array(T_ZBX_INT, O_OPT, P_SYS, DB_ID, NULL), ); @@ -106,13 +106,11 @@ function add_right(formname,type,id,permission,name){ $db_resources = null; - if($type == RESOURCE_TYPE_GROUP){ - $db_resources = DBselect('SELECT n.name as node_name, g.name as name, g.groupid as id'. - ' FROM groups g '. - ' LEFT JOIN nodes n on '.DBid2nodeid('g.groupid').'=n.nodeid '. - ($nodeid?' WHERE nodeid='.$nodeid:''). - ' ORDER BY n.name, g.name'); - } + $db_resources = DBselect('SELECT n.name as node_name, g.name as name, g.groupid as id'. + ' FROM groups g '. + ' LEFT JOIN nodes n on '.DBid2nodeid('g.groupid').'=n.nodeid '. + ($nodeid?' WHERE nodeid='.$nodeid:''). + ' ORDER BY n.name, g.name'); while($db_resource = DBfetch($db_resources)){ if(isset($db_resource['node_name'])) |