Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
plugin_dbui
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
w2pext
plugin_dbui
Commits
92d1015b
Commit
92d1015b
authored
8 years ago
by
LE GAC Renaud
Browse files
Options
Downloads
Patches
Plain Diff
Update ComboBoxMaster and Slave with an improved coding for the method onCreate.
parent
536ed684
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!27
Release 0.9.1
,
!26
8 extjs 6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
static/plugin_dbui/src/form/field/ComboBoxMaster.js
+17
-12
17 additions, 12 deletions
static/plugin_dbui/src/form/field/ComboBoxMaster.js
static/plugin_dbui/src/form/field/ComboBoxSlave.js
+14
-11
14 additions, 11 deletions
static/plugin_dbui/src/form/field/ComboBoxSlave.js
with
31 additions
and
23 deletions
static/plugin_dbui/src/form/field/ComboBoxMaster.js
+
17
−
12
View file @
92d1015b
...
...
@@ -166,33 +166,38 @@ Ext.define('Dbui.form.field.ComboBoxMaster', {
"
use strict
"
;
var
me
=
this
,
d
ata
=
[]
,
d
isplayField
=
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
);
},
/**
...
...
This diff is collapsed.
Click to expand it.
static/plugin_dbui/src/form/field/ComboBoxSlave.js
+
14
−
11
View file @
92d1015b
...
...
@@ -203,31 +203,34 @@ Ext.define('Dbui.form.field.ComboBoxSlave', {
"
use strict
"
;
var
me
=
this
,
d
ata
=
[]
,
d
isplayField
=
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
);
},
/**
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment