Skip to content

Commit ca6c358

Browse files
author
Open Lowcode SAS
committed
Close #213
1 parent ae9a433 commit ca6c358

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

src/org/openlowcode/server/data/loader/ConditionalAliasListParentHelper.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ public String[] getSpecificAliasList(ChoiceValue<F> selectedvalue, DataObjectId<
9999
for (int i=0;i<objectdefinition.getAliasNumber();i++) {
100100
String staticalias = objectdefinition.getAliasat(i);
101101
Pair<String, String>[] dynamicaliases = objectdefinition.getDynamicAliasForIndex(i);
102+
// ----------------------- Treat dynamic Alias ------------------------------
102103
if (dynamicaliases != null) {
103104
logger.severe(" starting processing alias " + i + " - " + staticalias);
104105
for (int j = 0; j < dynamicaliases.length; j++) {
@@ -127,6 +128,7 @@ public String[] getSpecificAliasList(ChoiceValue<F> selectedvalue, DataObjectId<
127128
}
128129
}
129130
}
131+
// ----------------------------------------------------------------------
130132
if (parentaliasfilter == null) {
131133
boolean isvalid = isAliasValid(staticalias, selectedvalue, conditionalaliaslist);
132134
if (isvalid) {
@@ -137,8 +139,12 @@ public String[] getSpecificAliasList(ChoiceValue<F> selectedvalue, DataObjectId<
137139
}
138140
if (parentaliasfilter != null)
139141
if (parentaliasfilter.isvalid(objectdefinition, staticalias, parent)) {
140-
aliasfilteredforparent.add(staticalias);
141-
logger.severe(" - add simple alias "+staticalias);
142+
boolean isvalid = isAliasValid(staticalias, selectedvalue, conditionalaliaslist);
143+
if (isvalid) {
144+
aliasfilteredforparent.add(staticalias);
145+
logger.severe(" - add simple alias "+staticalias);
146+
}
147+
142148
}
143149

144150
}

0 commit comments

Comments
 (0)