For #4117: show iteration label in TOC

orbeon · Aug 21, 2019 · 3f4b8b0 · 3f4b8b0
1 parent eadde82
commit 3f4b8b0
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/form-runner/jvm/src/main/resources/xbl/orbeon/wizard/wizard.xbl b/form-runner/jvm/src/main/resources/xbl/orbeon/wizard/wizard.xbl
@@ -1102,9 +1102,20 @@
                                         not($separate-toc-mode) and
                                         $current-nav-case-id = '{$static-section-id}-case' and
                                         xxf:repeat-position() = index('{$static-section-id}-repeater-repeat')"/>
-                                <xf:var
-                                    name="section-label"
-                                    value="concat(xxf:label('{$static-section-id}'), ' ', xxf:repeat-position())"/>
+
+                                <xsl:choose>
+                                    <xsl:when test="exists(fr:iteration-label)">
+                                        <xf:var
+                                            name="section-label"
+                                            context="."
+                                            value="xxf:value('{$static-section-id}-repeater-iteration-label', false())[xxf:repeat-position()]"/>
+                                    </xsl:when>
+                                    <xsl:otherwise>
+                                        <xf:var
+                                            name="section-label"
+                                            value="concat(xxf:label('{$static-section-id}'), ' ', xxf:repeat-position())"/>
+                                    </xsl:otherwise>
+                                </xsl:choose>
                             </xsl:when>
                             <xsl:otherwise>
                                 <xf:var
@@ -1123,8 +1134,6 @@
                             </xsl:otherwise>
                         </xsl:choose>
 
-
-
                         <xh:li class="{{
                             'disabled'           [not($top-level-section-available)],
                             'active'             [$section-active or $top-level-section-active],