diff options
| author | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-08-05 12:01:53 +0000 |
|---|---|---|
| committer | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-08-05 12:01:53 +0000 |
| commit | 31d9eeed8ba49cac9b2b9ebb3d1c77558df5ff0f (patch) | |
| tree | 00ed2cfb5b7077ed95225b61f091dd3400f516ea /frontends/php/include/forms.inc.php | |
| parent | b1a528879c1e7e7d7886a273cf954741d057e038 (diff) | |
| download | zabbix-31d9eeed8ba49cac9b2b9ebb3d1c77558df5ff0f.tar.gz zabbix-31d9eeed8ba49cac9b2b9ebb3d1c77558df5ff0f.tar.xz zabbix-31d9eeed8ba49cac9b2b9ebb3d1c77558df5ff0f.zip | |
- [DEV-198] Correct representation of disabled elements on the map (hosts, triggers)
git-svn-id: svn://svn.zabbix.com/trunk@5870 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/forms.inc.php')
| -rw-r--r-- | frontends/php/include/forms.inc.php | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php index 1ab553a8..7405b509 100644 --- a/frontends/php/include/forms.inc.php +++ b/frontends/php/include/forms.inc.php @@ -5074,8 +5074,10 @@ $cmbIconOff = new CComboBox("iconid_off",$iconid_off); $cmbIconOn = new CComboBox("iconid_on",$iconid_on); - $cmbIconUnknown = new CComboBox("iconid_unknown",$iconid_unknown); - $cmbIconDisabled= new CComboBox("iconid_disabled",$iconid_disabled); + if ($elementtype != SYSMAP_ELEMENT_TYPE_MAP) + $cmbIconUnknown = new CComboBox("iconid_unknown",$iconid_unknown); + if ($elementtype != SYSMAP_ELEMENT_TYPE_HOST_GROUP && $elementtype != SYSMAP_ELEMENT_TYPE_MAP) + $cmbIconDisabled= new CComboBox("iconid_disabled",$iconid_disabled); $result = DBselect('SELECT * FROM images WHERE imagetype=1 AND '.DBin_node('imageid').' order by name'); while($row=DBfetch($result)){ @@ -5083,14 +5085,22 @@ $cmbIconOff->AddItem($row["imageid"],$row["name"]); $cmbIconOn->AddItem($row["imageid"],$row["name"]); - $cmbIconUnknown->AddItem($row["imageid"],$row["name"]); - $cmbIconDisabled->AddItem($row["imageid"],$row["name"]); + if ($elementtype != SYSMAP_ELEMENT_TYPE_MAP) + $cmbIconUnknown->AddItem($row["imageid"],$row["name"]); + if ($elementtype != SYSMAP_ELEMENT_TYPE_HOST_GROUP && $elementtype != SYSMAP_ELEMENT_TYPE_MAP) + $cmbIconDisabled->AddItem($row["imageid"],$row["name"]); } $frmEl->AddRow(S_ICON_OFF,$cmbIconOff); $frmEl->AddRow(S_ICON_ON,$cmbIconOn); - $frmEl->AddRow(S_ICON_UNKNOWN,$cmbIconUnknown); - $frmEl->AddRow(S_ICON_DISABLED,$cmbIconDisabled); + if ($elementtype != SYSMAP_ELEMENT_TYPE_MAP) + $frmEl->AddRow(S_ICON_UNKNOWN, $cmbIconUnknown); + else + $frmEl->AddVar("iconid_unknown", 0); + if ($elementtype != SYSMAP_ELEMENT_TYPE_HOST_GROUP && $elementtype != SYSMAP_ELEMENT_TYPE_MAP) + $frmEl->AddRow(S_ICON_DISABLED,$cmbIconDisabled); + else + $frmEl->AddVar("iconid_disabled", 0); $frmEl->AddRow(S_COORDINATE_X, new CNumericBox("x", $x, 5)); $frmEl->AddRow(S_COORDINATE_Y, new CNumericBox("y", $y, 5)); |