summaryrefslogtreecommitdiffstats
path: root/frontends/php/include
diff options
context:
space:
mode:
authorartem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-05-08 13:07:14 +0000
committerartem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2008-05-08 13:07:14 +0000
commit161b61527272e53b75ff14697684f75c7872bdb6 (patch)
tree8f85159f839ceec935d6a9a16db8ffe5115f4442 /frontends/php/include
parent6ca88367efa0174e68b6da1ff81b40f002550f10 (diff)
downloadzabbix-161b61527272e53b75ff14697684f75c7872bdb6.tar.gz
zabbix-161b61527272e53b75ff14697684f75c7872bdb6.tar.xz
zabbix-161b61527272e53b75ff14697684f75c7872bdb6.zip
- [DEV-137] fixes in import/export (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5688 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include')
-rw-r--r--frontends/php/include/classes/ccombobox.inc.php2
-rw-r--r--frontends/php/include/import.inc.php9
2 files changed, 4 insertions, 7 deletions
diff --git a/frontends/php/include/classes/ccombobox.inc.php b/frontends/php/include/classes/ccombobox.inc.php
index 839e15f2..444bf7fb 100644
--- a/frontends/php/include/classes/ccombobox.inc.php
+++ b/frontends/php/include/classes/ccombobox.inc.php
@@ -209,7 +209,7 @@
$grp_tab->SetCellPadding(0);
if(!is_null($caption_l) || !is_null($caption_r)){
- $grp_tab->AddRow(array(bold($caption_l),SPACE,bold($caption_r)));
+ $grp_tab->AddRow(array($caption_l,SPACE,$caption_r));
}
$add_btn = new CButton('add',' « ');//S_ADD);//
diff --git a/frontends/php/include/import.inc.php b/frontends/php/include/import.inc.php
index afa58df6..3b543e04 100644
--- a/frontends/php/include/import.inc.php
+++ b/frontends/php/include/import.inc.php
@@ -34,14 +34,11 @@
$this->trigger = array('exist' => 0, 'missed' => 0);
$this->graph = array('exist' => 0, 'missed' => 0);
- $this->available_groups = get_accessible_groups_by_user($USER_DETAILS,
- PERM_READ_WRITE, null, PERM_RES_IDS_ARRAY, get_current_nodeid());
+ $this->available_groups = get_accessible_groups_by_user($USER_DETAILS, PERM_READ_WRITE, PERM_RES_IDS_ARRAY, get_current_nodeid());
- $this->available_hosts = get_accessible_hosts_by_user($USER_DETAILS,
- PERM_READ_WRITE, null, PERM_RES_IDS_ARRAY, get_current_nodeid());
+ $this->available_hosts = get_accessible_hosts_by_user($USER_DETAILS, PERM_READ_WRITE, PERM_RES_IDS_ARRAY, get_current_nodeid());
- $this->available_nodes = get_accessible_nodes_by_user($USER_DETAILS,
- PERM_READ_WRITE, null, PERM_RES_IDS_ARRAY, get_current_nodeid());
+ $this->available_nodes = get_accessible_nodes_by_user($USER_DETAILS, PERM_READ_WRITE, null, PERM_RES_IDS_ARRAY, get_current_nodeid());
}
function CharacterData($parser, $data) {