Skip to content
Snippets Groups Projects
Commit 92d1015b authored by LE GAC Renaud's avatar LE GAC Renaud
Browse files

Update ComboBoxMaster and Slave with an improved coding for the method onCreate.

parent 536ed684
No related branches found
No related tags found
2 merge requests!27Release 0.9.1,!268 extjs 6
......@@ -166,33 +166,38 @@ Ext.define('Dbui.form.field.ComboBoxMaster', {
"use strict";
var me = this,
data = [],
displayField = me.displayField,
keys = [],
model = me.model,
store = me.store,
valueField = me.valueField,
i, master, record;
store.removeAll(true);
if (me.userReset) {
data = [
[me.emptyText, null]
];
record = model.create();
record.set(displayField, me.emptyText);
record.set(valueField, undefined);
store.add(record);
}
for (i = 0; i < records.length; i += 1) {
master = records[i].get(me.displayField);
master = records[i].get(displayField);
if (keys.indexOf(master) === -1) {
keys.push(master);
record = me.model.create();
record.set(me.displayField, master);
record.set(me.valueField, records[i].get(me.valueField));
record = model.create();
record.set(displayField, master);
record.set(valueField, records[i].get(valueField));
data.push(record);
store.add(record);
}
}
// clear the store and load new data
me.store.loadRecords(data, false);
},
/**
......
......@@ -203,31 +203,34 @@ Ext.define('Dbui.form.field.ComboBoxSlave', {
"use strict";
var me = this,
data = [],
displayField = me.displayField,
keys = [],
masterValueField = me.masterValueField,
model = me.model,
store = me.store,
valueField = me.valueField,
i, key, master, record, slave;
store.removeAll(true);
for (i = 0; i < records.length; i += 1) {
master = records[i].get(me.masterValueField);
slave = records[i].get(me.displayField);
master = records[i].get(masterValueField);
slave = records[i].get(displayField);
key = master + slave;
if (keys.indexOf(key) === -1) {
keys.push(key);
record = me.model.create();
record.set(me.masterValueField, master);
record.set(me.displayField, slave);
record.set(me.valueField, records[i].get(me.valueField));
record = model.create();
record.set(masterValueField, master);
record.set(displayField, slave);
record.set(valueField, records[i].get(valueField));
data.push(record);
store.add(record);
}
}
// clear the store and load new data
me.store.loadRecords(data, false);
},
/**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment