From: Alan Knowles Date: Fri, 28 Feb 2020 07:50:26 +0000 (+0800) Subject: Roo/form/ComboNested.js X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=6ea1ed90c2a455fb453bb6f86f5d3435218f1ad6 Roo/form/ComboNested.js --- diff --git a/Roo/form/ComboNested.js b/Roo/form/ComboNested.js index a88dc16346..dc266a189a 100644 --- a/Roo/form/ComboNested.js +++ b/Roo/form/ComboNested.js @@ -323,11 +323,12 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, { findRecord : function (prop,value) { - return this.findRecordInStore(this.store, prop,value); + + return this.findRecordInStore(this.store, prop,value); }, // private - findRecordInStore : function(store, prop, value) + recordToStores : function(store, prop, value, stack) { var cstore = new Roo.data.SimpleStore({ //fields : this.store.reader.meta.fields, // we need array reader.. for @@ -346,7 +347,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, { } if (r.data.cn && r.data.cn.length) { cstore.loadDataFromChildren( r); - var cret = _this.findRecordInStore(cstore, prop, value); + var cret = _this.recordToStores(cstore, prop, value, stack); if (cret !== false) { record = cret; return false; @@ -355,7 +356,10 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, { return true; }); - + if (record == false) { + return false + } + stack.unshift(store, record); return record; },