This is an automated email from the ASF dual-hosted git repository.
danwatford pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 32d60dd03e Fixed: Render link text in PDF and CSV output (OFBIZ-12775)
32d60dd03e is described below
commit 32d60dd03eca1f95ea6bbba99d040229cb3ca763
Author: Daniel Watford <dan...@watfordconsulting.com>
AuthorDate: Mon Mar 13 20:52:36 2023 +0000
Fixed: Render link text in PDF and CSV output (OFBIZ-12775)
The makeHyperlinkString macros for the PDF and CSV form renderers have
been updated to match the same macro for the HTML renderer, ensuring
that all expected macro parameters are defined.
---
themes/common-theme/template/macro/CsvFormMacroLibrary.ftl | 2 +-
themes/common-theme/template/macro/FoFormMacroLibrary.ftl | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
b/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
index 742737de62..945a2ad493 100644
--- a/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
@@ -122,4 +122,4 @@ under the License.
<#macro renderAsterisks requiredField requiredStyle></#macro>
<#macro makeHiddenFormLinkForm actionUrl name parameters targetWindow></#macro>
<#macro makeHiddenFormLinkAnchor linkStyle hiddenFormName event action imgSrc
description confirmation><@renderField description /></#macro>
-<#macro makeHyperlinkString linkStyle hiddenFormName event action imgSrc title
targetParameters alternate linkUrl targetWindow description confirmation
uniqueItemName="" height="" width="" id=""><@renderField description
/>,<#rt/></#macro>
+<#macro makeHyperlinkString hiddenFormName imgSrc imgTitle title alternate
linkUrl description linkStyle="" event="" action="" targetParameters=""
targetWindow="" confirmation="" uniqueItemName="" height="" width=""
id=""><@renderField description />,<#rt/></#macro>
diff --git a/themes/common-theme/template/macro/FoFormMacroLibrary.ftl
b/themes/common-theme/template/macro/FoFormMacroLibrary.ftl
index 064474c739..2613290277 100644
--- a/themes/common-theme/template/macro/FoFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/FoFormMacroLibrary.ftl
@@ -146,7 +146,7 @@ under the License.
<#macro formatBoundaryComment boundaryType widgetType widgetName></#macro>
<#macro makeHiddenFormLinkForm actionUrl name parameters targetWindow></#macro>
<#macro makeHiddenFormLinkAnchor linkStyle hiddenFormName event action imgSrc
description><@renderField description /></#macro>
-<#macro makeHyperlinkString linkStyle hiddenFormName event action imgSrc title
targetParameters alternate linkUrl targetWindow description confirmation
uniqueItemName="" height="" width="" id=""><@makeBlock linkStyle description
/></#macro>
+<#macro makeHyperlinkString hiddenFormName imgSrc imgTitle title alternate
linkUrl description linkStyle="" event="" action="" targetParameters=""
targetWindow="" confirmation="" uniqueItemName="" height="" width=""
id=""><@makeBlock linkStyle description /></#macro>
<#macro renderTooltip tooltip tooltipStyle></#macro>
<#macro renderAsterisks requiredField requiredStyle></#macro>
</#escape>
