Roo/bootstrap/ComboBox.js

diff --git a/Roo/bootstrap/ComboBox.js b/Roo/bootstrap/ComboBox.js
index 86e7954..f43e95f 100644 (file)
--- a/Roo/bootstrap/ComboBox.js
+++ b/Roo/bootstrap/ComboBox.js
@@ -1040,8 +1040,9 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
                 for(var i=0;i<o.display_name.length;i++){
                     this.addItem({'id':o.id[i],'display_name':o.display_name[i]});
                 }
+                return;
             }
-            //this.addItem(o);
+            this.addItem(o);
             return;
         }