Fix #3995 "fr:dataset-write doesn't create the associated xf:instance"

orbeon · Jun 10, 2019 · e825ea4 · e825ea4
1 parent 35ed001
commit e825ea4
Showing 1 changed file with 22 additions and 10 deletions.
diff --git a/form-runner/jvm/src/main/resources/apps/fr/components/actions.xsl b/form-runner/jvm/src/main/resources/apps/fr/components/actions.xsl
@@ -207,16 +207,28 @@
         <xsl:variable
             name="dataset-names"
             select="
-                distinct-values(
-                    $action-bindings//
-                        xf:action[
-                            p:has-class('fr-save-to-dataset-action')
-                        ]/
-                        xf:var[@name = 'dataset-name']/
-                        string()
-                )"/>
-
-        <xsl:for-each select="$dataset-names">
+                $action-bindings//
+                    xf:action[
+                        p:has-class('fr-save-to-dataset-action')
+                    ]/
+                    xf:var[@name = 'dataset-name']/
+                    string()
+                "/>
+
+        <xsl:variable
+            name="actions-20182"
+            select="
+                $model/
+                    fr:action[
+                        @version = '2018.2'
+                    ]"/>
+
+        <xsl:variable
+            name="dataset-names-20182"
+            select="$actions-20182//fr:dataset-write/@name/string()"/>
+
+
+        <xsl:for-each select="distinct-values(($dataset-names, $dataset-names-20182))">
             <xf:instance id="fr-dataset-{.}"><dataset/></xf:instance>
         </xsl:for-each>