Fix #4183 "Incorrect xxf:repeat-position() value just after iterati…

…on move"
orbeon · Sep 18, 2019 · 3e1f4cd · 3e1f4cd
1 parent d3f3a12
commit 3e1f4cd
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 5 deletions.
diff --git a/xforms/jvm/src/main/scala/org/orbeon/oxf/xforms/control/Controls.scala b/xforms/jvm/src/main/scala/org/orbeon/oxf/xforms/control/Controls.scala
@@ -64,11 +64,8 @@ object Controls {
     // This is the context of the iteration
     // buildTree() does a pushBinding(), but that won't change the context (no @ref, etc. on the iteration itself)
     val container = repeatControl.container
-    val bindingContext = {
-      val contextStack = container.getContextStack
-      contextStack.setBinding(repeatControl.bindingContext)
-      contextStack.pushIteration(iterationIndex)
-    }
+    val bindingContext =
+      container.getContextStack.setBinding(repeatControl.bindingContext)
 
     // This has to be the case at this point, otherwise it's a bug in our code
     assert(repeatControl.staticControl.iteration.isDefined)

diff --git a/xforms/jvm/src/test/resources/org/orbeon/oxf/xforms/tests-xforms-repeat.xml b/xforms/jvm/src/test/resources/org/orbeon/oxf/xforms/tests-xforms-repeat.xml
@@ -3303,6 +3303,67 @@
         </output>
     </test>
 
+    <test description="For #4183: Incorrect `xxf:repeat-position()` value just after iteration move" name="oxf:pipeline">
+        <input name="config" href="wrap-xforms-state.xpl"/>
+        <input name="document">
+            <xh:html>
+                <xh:head>
+                    <xf:model id="model">
+                        <xf:instance id="instance">
+                            <values>
+                                <value/>
+                                <value/>
+                            </values>
+                        </xf:instance>
+                        <xf:insert
+                            event="xforms-ready"
+                            ref="value[1]"
+                            origin="xf:element('value')"
+                            position="after"/>
+                    </xf:model>
+                </xh:head>
+                <xh:body>
+                    <xf:repeat id="my-repeat" ref="value">
+                        <xf:output id="my-output" value="xxf:repeat-position()"/>
+                    </xf:repeat>
+                </xh:body>
+            </xh:html>
+        </input>
+        <output name="response">
+            <xxf:event-response xmlns:xxf="http://orbeon.org/oxf/xml/xforms">
+                <xxf:dynamic-state>
+                    <dynamic-state>
+                        <instances>
+                            <instance id="instance" model-id="model">
+                                <values>
+                                    <value/>
+                                    <value/>
+                                    <value/>
+                                </values>
+                            </instance>
+                        </instances>
+                        <controls>
+                            <control effective-id="my-repeat" index="2"/>
+                        </controls>
+                    </dynamic-state>
+                </xxf:dynamic-state>
+                <xxf:action>
+                    <xxf:control-values>
+                        <xxf:control id="my-output⊙1">
+                            <xxf:value>1</xxf:value>
+                        </xxf:control>
+                        <xxf:control id="my-output⊙2">
+                            <xxf:value>2</xxf:value>
+                        </xxf:control>
+                        <xxf:control id="my-output⊙3">
+                            <xxf:value>3</xxf:value>
+                        </xxf:control>
+                    </xxf:control-values>
+                </xxf:action>
+            </xxf:event-response>
+        </output>
+    </test>
+
     <!--
 
     TODO: