projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
77dbfbd
)
Roo/form/ComboNested.js
author
Alan Knowles
<alan@roojs.com>
Fri, 28 Feb 2020 07:50:26 +0000
(15:50 +0800)
committer
Alan Knowles
<alan@roojs.com>
Fri, 28 Feb 2020 07:50:26 +0000
(15:50 +0800)
Roo/form/ComboNested.js
patch
|
blob
|
history
diff --git
a/Roo/form/ComboNested.js
b/Roo/form/ComboNested.js
index
a88dc16
..
dc266a1
100644
(file)
--- 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)
{
findRecord : function (prop,value)
{
- return this.findRecordInStore(this.store, prop,value);
+
+ return this.findRecordInStore(this.store, prop,value);
},
// private
},
// 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
{
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);
}
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;
if (cret !== false) {
record = cret;
return false;
@@
-355,7
+356,10
@@
Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
return true;
});
return true;
});
-
+ if (record == false) {
+ return false
+ }
+ stack.unshift(store, record);
return record;
},
return record;
},