baculum: Extend combobox control to support associative arrays as data source

diff --git a/gui/baculum/protected/Web/Portlets/DirectiveComboBox.php b/gui/baculum/protected/Web/Portlets/DirectiveComboBox.php
index 2c1a2001ec472d57cb651f8775c172d6cac1e410..6cd148ffe6272649c9033e8d2d7a76106e1c9544 100644 (file)
--- a/gui/baculum/protected/Web/Portlets/DirectiveComboBox.php
+++ b/gui/baculum/protected/Web/Portlets/DirectiveComboBox.php
@@ -64,8 +64,16 @@ class DirectiveComboBox extends DirectiveTemplate {
                                $items = $resource_names[$resource];
                        }
                }
-               array_unshift($items, '');
-               $this->Directive->dataSource = array_combine($items, $items);
+               reset($items);
+               if (key($items) === 0) {
+                       // indexed array as data source
+                       array_unshift($items, '');
+                       $items = array_combine($items, $items);
+               } elseif (is_string(key($items))) {
+                       // associative array as data source
+                       $items = array_merge(array('' => ''), $items);
+               }
+               $this->Directive->DataSource = $items;
 
                $directive_value = $this->getDirectiveValue();
                $default_value = $this->getDefaultValue();