From 166ceee8d9b7cb4d9da0f0da251f96d5b5522352 Mon Sep 17 00:00:00 2001
From: Michael <michael@roojs.com>
Date: Wed, 11 Feb 2015 17:02:09 +0800
Subject: [PATCH] Roo/bootstrap/ComboBox.js

---
 Roo/bootstrap/ComboBox.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Roo/bootstrap/ComboBox.js b/Roo/bootstrap/ComboBox.js
index 86e7954568..a2593c1136 100644
--- a/Roo/bootstrap/ComboBox.js
+++ b/Roo/bootstrap/ComboBox.js
@@ -1036,12 +1036,12 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
     setFromData : function(o){
         
         if(this.multiple){
-            if(typeof o.display_name !== 'string'){
-                for(var i=0;i<o.display_name.length;i++){
-                    this.addItem({'id':o.id[i],'display_name':o.display_name[i]});
-                }
-            }
-            //this.addItem(o);
+            // if(typeof o.display_name !== 'string'){
+            //     for(var i=0;i<o.display_name.length;i++){
+            //         this.addItem({'id':o.id[i],'display_name':o.display_name[i]});
+            //     }
+            // }
+            this.addItem(o);
             return;
         }
             
-- 
2.39.2