You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2021/12/18 10:58:53 UTC
[ofbiz-framework] branch trunk updated (75dab17 -> 47d8fea)
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git.
from 75dab17 Fixed: Price Rules: Price rules configurations are not syncing with eCommerce storefront (OFBIZ-12450) (#420)
new c0e637d Improved: Fix some bugs Spotbugs reports (OFBIZ-12386)
new 47d8fea Fixed: Bug in HtmlFormMacroLibrary.ftl::makeHyperlinkString macro (OFBIZ-12468)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
spotbugs/exclude.xml | 4 ++--
themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
[ofbiz-framework] 02/02: Fixed: Bug in HtmlFormMacroLibrary.ftl::makeHyperlinkString macro (OFBIZ-12468)
Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 47d8fea5fde3729e54fc66b85e4a0deef57edf3b
Author: Jacques Le Roux <ja...@les7arts.com>
AuthorDate: Sat Dec 18 11:44:29 2021 +0100
Fixed: Bug in HtmlFormMacroLibrary.ftl::makeHyperlinkString macro (OFBIZ-12468)
I was unable to reproduce the error, but according to
https://stackoverflow.com/questions/51524640/why-does-freemarkers-built-in-is-string-return-true-for-an-object
The solution is to check for targetParameters not being an hash
Actually this was not the reason of the 1.7GB console log, another Jira to come
---
themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl b/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
index 4652786..10ef79f 100644
--- a/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
@@ -738,7 +738,7 @@ Parameter: delegatorName, String, optional - name of the delegator in context.
<#macro makeHyperlinkString hiddenFormName imgSrc title alternate linkUrl description linkStyle="" event="" action="" targetParameters="" targetWindow="" confirmation="" uniqueItemName="" height="" width="" id="">
<#if uniqueItemName?has_content>
<#local params = "{"presentation": "layer"">
- <#if targetParameters?has_content>
+ <#if targetParameters?has_content && !targetParameters?is_hash>
<#local parameterMap = targetParameters?eval>
<#local parameterKeys = parameterMap?keys>
<#list parameterKeys as key>
[ofbiz-framework] 01/02: Improved: Fix some bugs Spotbugs reports (OFBIZ-12386)
Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit c0e637d72f121e4089118261b666cdb7a55353e7
Author: Jacques Le Roux <ja...@les7arts.com>
AuthorDate: Sat Dec 18 11:05:16 2021 +0100
Improved: Fix some bugs Spotbugs reports (OFBIZ-12386)
I made a mistake in 1 exclusion
---
spotbugs/exclude.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/spotbugs/exclude.xml b/spotbugs/exclude.xml
index a5b0fd2..dab253e 100644
--- a/spotbugs/exclude.xml
+++ b/spotbugs/exclude.xml
@@ -127,8 +127,8 @@
<Match>
<!-- not a problem this is used only once during test, no possible collisions -->
<!-- Moreover this is now commented out to allow building with BuilBot 3.3.2 -->
- <Class name="org.apache.ofbiz.service.test" />
- <Method name="XmlRpcTests" />
+ <Class name="org.apache.ofbiz.service.test.XmlRpcTests" />
+ <Field name="url" />
<Bug pattern="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD" />
</Match>
<Match>