diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-04-18 10:19:40 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-04-18 10:19:40 +0000 |
| commit | b4726586d8164b091529c2105b80e647139c13c8 (patch) | |
| tree | 56465cac603d80607d0f8820f5ec21ad6954d14f /frontends/php/include/classes | |
| parent | 5ee0e65e708340172b938d324ca316b0204b7dc5 (diff) | |
| download | zabbix-b4726586d8164b091529c2105b80e647139c13c8.tar.gz zabbix-b4726586d8164b091529c2105b80e647139c13c8.tar.xz zabbix-b4726586d8164b091529c2105b80e647139c13c8.zip | |
- [ZBX-362] improvements in linkage form (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5636 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/classes')
| -rw-r--r-- | frontends/php/include/classes/ccombobox.inc.php | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/frontends/php/include/classes/ccombobox.inc.php b/frontends/php/include/classes/ccombobox.inc.php index a3c54f0b..089038a9 100644 --- a/frontends/php/include/classes/ccombobox.inc.php +++ b/frontends/php/include/classes/ccombobox.inc.php @@ -85,19 +85,24 @@ function AddItem($value, $caption='', $selected=NULL, $enabled='yes') { // if($enabled=='no') return; /* disable item method 1 */ - if(is_null($selected)){ - $selected = 'no'; - if(is_array($this->value)) { - if(str_in_array($value,$this->value)) + if(strtolower(get_class($value))=='ccomboitem') { + parent::AddItem($value); + } + else{ + if(is_null($selected)){ + $selected = 'no'; + if(is_array($this->value)) { + if(str_in_array($value,$this->value)) + $selected = 'yes'; + } + else if(strcmp($value,$this->value) == 0) + { $selected = 'yes'; + } } - else if(strcmp($value,$this->value) == 0) - { - $selected = 'yes'; - } + + parent::AddItem(new CComboItem($value,$caption,$selected,$enabled)); } - - parent::AddItem(new CComboItem($value,$caption,$selected,$enabled)); } } |