Roo/bootstrap/ComboBox.js

diff --git a/Roo/bootstrap/ComboBox.js b/Roo/bootstrap/ComboBox.js
index 6e687f8..9e0a5cc 100644 (file)
--- a/Roo/bootstrap/ComboBox.js
+++ b/Roo/bootstrap/ComboBox.js
@@ -1036,7 +1036,12 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
     setFromData : function(o){
         
         if(this.multiple){
-            this.addItem(o);
+            if(typeof o.display_name !== 'string'){
+                for(var dn in o.display_name){
+                    this.addItem({'id':o.id,'display_name':dn});
+                }
+            }
+            //this.addItem(o);
             return;
         }