X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2Fform%2FComboBoxArray.js;h=95e08178a084057ab5b6b3f0c0c99700e705846d;hb=70ed4eccbce50a2408f6de0da694a6c64458d58b;hp=745b49bf3ef073da1de4c54012e68ab2b5fea208;hpb=5608b73138564ec2928a0c8eabaee6fe419e92e2;p=roojs1

diff --git a/Roo/form/ComboBoxArray.js b/Roo/form/ComboBoxArray.js
index 745b49bf3e..95e08178a0 100644
--- a/Roo/form/ComboBoxArray.js
+++ b/Roo/form/ComboBoxArray.js
@@ -7,7 +7,7 @@
 
 /**
  * @class Roo.form.ComboBoxArray
- * @extends Roo.form.ComboBox
+ * @extends Roo.form.TextField
  * A facebook style adder... for lists of email / people / countries  etc...
  * pick multiple items from a combo box, and shows each one.
  *
@@ -73,7 +73,7 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
      */
     name : false,
     /**
-     * @cfg {String} name    The hidden name of the field, often contains an comma seperated list of names
+     * @cfg {String} hiddenName    The hidden name of the field, often contains an comma seperated list of names
      */
     hiddenName : false,
     
@@ -82,7 +82,7 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
     items  : false,
     // private - the hidden field el.
     hiddenEl : false,
-    
+    // private - the filed el..
     el : false,
     
     //validateValue : function() { return true; }, // all values are ok!
@@ -103,7 +103,9 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
         this.combo.onRender(ct, position);
         
         // assigned so form know we need to do this..
-        this.store = this.combo.store;
+        this.store          = this.combo.store;
+        this.valueField     = this.combo.valueField;
+        this.displayField   = this.combo.displayField ;
         
         
         this.combo.wrap.addClass('x-cbarray-grp');
@@ -266,16 +268,48 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
     setValue: function(v) // not a valid action - must use addItems..
     {
          
-        Roo.log(v);
-        Roo.log(this.hiddenEl.dom.value);
-        Roo.log(this.el.dom.value);
         
-        var _this = this;
-        Roo.each(v, function(l) {
-            _this.addItem(l);
-        });
+        if (this.store.isLocal) {
+            // then we can use the store to find the values..
+            // comma seperated at present.. this needs to allow JSON based encoding..
+            this.hiddenEl.value  = v;
+            var v_ar = [];
+            Roo.each(v.split(','), function(k) {
+                Roo.log("CHECK " + this.valueField + ',' + k);
+                var li = this.store.query(this.valueField, k);
+                if (!li.length) {
+                    return;
+                }
+                add = {};
+                add[this.valueField] = k;
+                add[this.displayField] = li.item(0).data[this.displayField];
+                
+                this.addItem(add);
+            }, this) 
+            
+                
+            
+        }
+        
         
     },
+    setFromData: function(v)
+    {
+        // this recieves an object, if setValues is called.
+        var keys = v[this.valueField].split(',');
+        var display = v[this.displayField].split(',');
+        for (var i = 0 ; i < keys.length; i++) {
+            
+            add = {};
+            add[this.valueField] = keys[i];
+            add[this.displayField] = display[i];
+            this.addItem(add);
+        }
+      
+        
+    },
+    
+    
     validateValue : function(value){
         return Roo.form.ComboBoxArray.superclass.validateValue.call(this, this.getValue());