Skip to content

Commit b4e30d3

Browse files
committed
Fixed an issue with the field loop expressions <IF EXPLICIT_GROUP>, <IF GROUP> and <IF_IMPLICIT_GROUP> which would previously evaluate to true for explicit group fields, but not explicit group overlay fields. Now it evaluates to true for both.
1 parent 9fe511d commit b4e30d3

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

CodeGenEngine/ExpressionEvaluators/ExpressionEvaluatorFieldLoop.dbl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,7 +1084,7 @@ namespace CodeGen.Engine
10841084
loops, @IEnumerable<LoopNode>
10851085
endparams
10861086
proc
1087-
lambda doEvaluate(str, field, index) (field.GroupType == RpsFieldGroup.Yes && String.IsNullOrWhiteSpace(field.GroupStructure))
1087+
lambda doEvaluate(str, field, index) (field.GroupType != RpsFieldGroup.No && String.IsNullOrWhiteSpace(field.GroupStructure))
10881088
mreturn EvaluateFieldLoopExpression(tkn, template, loops, doEvaluate)
10891089
endmethod
10901090

@@ -1114,7 +1114,7 @@ namespace CodeGen.Engine
11141114
loops, @IEnumerable<LoopNode>
11151115
endparams
11161116
proc
1117-
lambda doEvaluate(str, field, index) (field.GroupType == RpsFieldGroup.Yes)
1117+
lambda doEvaluate(str, field, index) (field.GroupType != RpsFieldGroup.No)
11181118
mreturn EvaluateFieldLoopExpression(tkn, template, loops, doEvaluate)
11191119
endmethod
11201120

@@ -1164,7 +1164,7 @@ namespace CodeGen.Engine
11641164
loops, @IEnumerable<LoopNode>
11651165
endparams
11661166
proc
1167-
lambda doEvaluate(str, field, index) (field.GroupType == RpsFieldGroup.Yes && !String.IsNullOrWhiteSpace(field.GroupStructure))
1167+
lambda doEvaluate(str, field, index) (field.GroupType != RpsFieldGroup.No && !String.IsNullOrWhiteSpace(field.GroupStructure))
11681168
mreturn EvaluateFieldLoopExpression(tkn, template, loops, doEvaluate)
11691169
endmethod
11701170

Documentation/CodeGen.chm

2 Bytes
Binary file not shown.

Documentation/CodeGen.hsm

672 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)