Roo/form/ComboNested.js

[roojs1] / Roo / form / ComboNested.js

diff --git a/Roo/form/ComboNested.js b/Roo/form/ComboNested.js
index 6eed134..a098c5c 100644 (file)
--- a/Roo/form/ComboNested.js
+++ b/Roo/form/ComboNested.js
@@ -283,7 +283,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
         var ix = view.getSelectedIndexes();
         
         
-        if (opts.list > 2) {
+        if (opts.list > this.maxColumns - 2) {
              
             this.setFromData(ix.length ? view.store.getAt(ix[0]).data : {});
             return;
@@ -291,7 +291,8 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
         
         if (!ix.length) {
             this.setFromData({});
-            this.stores[opts.list+1].loadData( [] );
+            var str = this.stores[opts.list+1];
+            str.removeAll();
             return;
         }
         
@@ -301,9 +302,9 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
         var lw = Math.floor(
                 ((this.listWidth * this.maxColumns || Math.max(this.wrap.getWidth(), this.minListWidth)) - this.list.getFrameWidth('lr')) / this.maxColumns
         );
-        var data =  typeof(rec.data.cn) == 'undefined' ? [] : rec.data.cn;
-        var dl = typeof(data.data) != 'undefined' ? data.total : data.length; ///json is a nested response..
-        this.stores[opts.list+1].loadData( data );
+        
+        this.stores[opts.list+1].loadDataFromChildren( rec );
+        var dl = this.stores[opts.list+1]. getTotalCount();
         this.views[opts.list+1].getEl().setHeight( this.innerLists[0].getHeight());
         this.views[opts.list+1].getEl().setStyle({ display : dl ? 'block' : 'none' });
         this.innerLists[opts.list+1].setHeight( this.innerLists[0].getHeight());
@@ -321,7 +322,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
         return this.findRecordInStore(this.store, prop,value);
     },
     
-     // private
+    // private
     findRecordInStore : function(store, prop, value)
     {
         var cstore = new Roo.data.SimpleStore({