From f61cac0f048c0b6b521bf5ee6406c6a9c5b03cdd Mon Sep 17 00:00:00 2001
From: Erik Bruchez <erik@bruchez.org>
Date: Wed, 2 Oct 2024 12:53:23 -0700
Subject: [PATCH] For #6518: rename event parameter

---
 .../forms/orbeon/builder/form/toolbox.xml      |  2 +-
 .../dialog-form-settings.xbl                   |  8 ++++----
 .../config/properties-form-builder.xml         | 18 +++++++++---------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/form-builder/jvm/src/main/resources/forms/orbeon/builder/form/toolbox.xml b/form-builder/jvm/src/main/resources/forms/orbeon/builder/form/toolbox.xml
index 92713e41c00..d6bc8e42044 100644
--- a/form-builder/jvm/src/main/resources/forms/orbeon/builder/form/toolbox.xml
+++ b/form-builder/jvm/src/main/resources/forms/orbeon/builder/form/toolbox.xml
@@ -44,7 +44,7 @@
                     <xf:action ev:event="DOMActivate">
                         <!-- Open the dialog in "edit" mode -->
                         <xxf:show dialog="dialog-form-settings">
-                            <xf:property name="for-action"                                value="event('for-action')"/>
+                            <xf:property name="for-button-name"                           value="event('for-button-name')"/>
                             <xf:property name="lang"                                      value="$fb-lang"/>
                             <xf:property name="langs"                                     value="$resources/resource/@xml:lang/string()"/>
                             <xf:property name="mode"                                      value="(event('mode'), 'edit')[1]"/>
diff --git a/form-builder/jvm/src/main/resources/xbl/fb/dialog-form-settings/dialog-form-settings.xbl b/form-builder/jvm/src/main/resources/xbl/fb/dialog-form-settings/dialog-form-settings.xbl
index 40cb17a52ff..b2f99f1064a 100644
--- a/form-builder/jvm/src/main/resources/xbl/fb/dialog-form-settings/dialog-form-settings.xbl
+++ b/form-builder/jvm/src/main/resources/xbl/fb/dialog-form-settings/dialog-form-settings.xbl
@@ -40,7 +40,7 @@
                 <!-- Save event context information in local instance -->
                 <xf:setvalue
                     iterate="
-                        'for-action', 'app', 'form', 'title', 'description', 'screenshot', 'allow-template-use',
+                        'for-button-name', 'app', 'form', 'title', 'description', 'screenshot', 'allow-template-use',
                         'singleton', 'mode', 'created-with-version'"
                     ref="$i/*[name() = context()]"
                     value="event(context())"/>
@@ -466,7 +466,7 @@
 
                 <xf:instance id="local">
                     <_ valid="true">
-                        <for-action/>
+                        <for-button-name/>
                         <lang/>
                         <original-app/>
                         <app/>
@@ -819,9 +819,9 @@
                             if ($is-new-form) then
                                 (: No title in this case :)
                                 ()
-                            else if (xxf:non-blank($i/for-action)) then
+                            else if (xxf:non-blank($i/for-button-name)) then
                                 (: The action must match a process button and we use the associated text label if present :)
-                                let $r := xxf:r(concat('buttons.', $i/for-action), '|fr-fr-resources|')
+                                let $r := xxf:r(concat('buttons.', $i/for-button-name), '|fr-fr-resources|')
                                 return
                                     if (exists($r)) then
                                         string(xf:parse(concat('&lt;span>', $r, '&lt;/span>')))
diff --git a/src/main/resources/config/properties-form-builder.xml b/src/main/resources/config/properties-form-builder.xml
index 2f6622e7ef8..7297db45166 100644
--- a/src/main/resources/config/properties-form-builder.xml
+++ b/src/main/resources/config/properties-form-builder.xml
@@ -145,7 +145,7 @@
             return
                 xxf:is-blank($metadata/application-name) or xxf:is-blank($metadata/form-name)
         ") then (
-            xf:dispatch(name = "DOMActivate", targetid="open-form-settings-trigger", mode = "app-form", for-action = "excel-export") then
+            xf:dispatch(name = "DOMActivate", targetid="open-form-settings-trigger", mode = "app-form", for-button-name = "excel-export") then
             suspend then
             xf:dispatch(name = "fb-excel-export")
         ) else
@@ -158,7 +158,7 @@
             return
                 xxf:is-blank($metadata/application-name) or xxf:is-blank($metadata/form-name)
         ") then (
-            xf:dispatch(name = "DOMActivate", targetid="open-form-settings-trigger", mode = "app-form", for-action = "xml-export") then
+            xf:dispatch(name = "DOMActivate", targetid="open-form-settings-trigger", mode = "app-form", for-button-name = "xml-export") then
             suspend then
             xf:dispatch(name = "fb-xml-export")
         ) else
@@ -171,7 +171,7 @@
             return
                 xxf:is-blank($metadata/application-name) or xxf:is-blank($metadata/form-name)
         ") then (
-            xf:dispatch(name = "DOMActivate", targetid="open-form-settings-trigger", mode = "app-form", for-action = "form-definition-xhtml-export") then
+            xf:dispatch(name = "DOMActivate", targetid="open-form-settings-trigger", mode = "app-form", for-button-name = "form-definition-xhtml-export") then
             suspend then
             xf:show(
                 dialog = "fb-publish-dialog",
@@ -188,7 +188,7 @@
             return
                 xxf:is-blank($metadata/application-name) or xxf:is-blank($metadata/form-name)
         ") then (
-            xf:dispatch(name = "DOMActivate", targetid="open-form-settings-trigger", mode = "app-form", for-action = "test") then
+            xf:dispatch(name = "DOMActivate", targetid="open-form-settings-trigger", mode = "app-form", for-button-name = "test") then
             suspend then
             xf:dispatch(name = "fb-test-form")
         ) else
@@ -201,7 +201,7 @@
             return
                 xxf:is-blank($metadata/application-name) or xxf:is-blank($metadata/form-name)
         ") then (
-            xf:dispatch(name = "DOMActivate", targetid="open-form-settings-trigger", mode = "app-form", for-action = "test-formulas") then
+            xf:dispatch(name = "DOMActivate", targetid="open-form-settings-trigger", mode = "app-form", for-button-name = "test-formulas") then
             suspend then
             xf:dispatch(name = "fb-test-formulas")
         ) else
@@ -214,7 +214,7 @@
             return
                 xxf:is-blank($metadata/application-name) or xxf:is-blank($metadata/form-name)
         ") then (
-            xf:dispatch(name = "DOMActivate", targetid="open-form-settings-trigger", mode = "app-form", for-action = "test-offline") then
+            xf:dispatch(name = "DOMActivate", targetid="open-form-settings-trigger", mode = "app-form", for-button-name = "test-offline") then
             suspend then
             xf:dispatch(name = "fb-test-offline")
         ) else
@@ -227,7 +227,7 @@
             return
                 xxf:is-blank($metadata/application-name) or xxf:is-blank($metadata/form-name)
         ") then (
-            xf:dispatch(name = "DOMActivate", targetid="open-form-settings-trigger", mode = "app-form", for-action = "test-pdf") then
+            xf:dispatch(name = "DOMActivate", targetid="open-form-settings-trigger", mode = "app-form", for-button-name = "test-pdf") then
             suspend then
             xf:dispatch(name = "fb-test-pdf-show-dialog")
         ) else
@@ -240,7 +240,7 @@
             return
                 xxf:is-blank($metadata/application-name) or xxf:is-blank($metadata/form-name)
         ") then (
-            xf:dispatch(name = "DOMActivate", targetid="open-form-settings-trigger", mode = "app-form", for-action = "publish") then
+            xf:dispatch(name = "DOMActivate", targetid="open-form-settings-trigger", mode = "app-form", for-button-name = "publish") then
             suspend then
             xf:show(
                 dialog = "fb-publish-dialog",
@@ -261,7 +261,7 @@
             return
                 xxf:is-blank($metadata/application-name) or xxf:is-blank($metadata/form-name)
         ") then (
-            xf:dispatch(name = "DOMActivate", targetid="open-form-settings-trigger", mode = "app-form", for-action = "save") then
+            xf:dispatch(name = "DOMActivate", targetid="open-form-settings-trigger", mode = "app-form", for-button-name = "save") then
             suspend then
             save-final
         ) else