You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2020/01/12 11:09:21 UTC
[struts] 03/03: WW-5054 Fixes links in config-browser
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch WW-5054-debug-browser
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 2c02100c293723dba5183a34fe16c12f81342b3f
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Sun Jan 12 12:08:59 2020 +0100
WW-5054 Fixes links in config-browser
---
.../config-browser/src/main/resources/config-browser/actionNames.ftl | 2 +-
.../config-browser/src/main/resources/config-browser/showConfig.ftl | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/plugins/config-browser/src/main/resources/config-browser/actionNames.ftl b/plugins/config-browser/src/main/resources/config-browser/actionNames.ftl
index 54a5565..226f2a5 100644
--- a/plugins/config-browser/src/main/resources/config-browser/actionNames.ftl
+++ b/plugins/config-browser/src/main/resources/config-browser/actionNames.ftl
@@ -26,7 +26,7 @@
<td>
<ul>
<#list actionNames as name>
- <@s.url var="showConfig" action="showConfig" includeParams="none">
+ <@s.url var="showConfig" action="showConfig" includeParams="none" escapeAmp="false">
<@s.param name="namespace">${namespace}</...@s.param>
<@s.param name="actionName">${name}</...@s.param>
</...@s.url>
diff --git a/plugins/config-browser/src/main/resources/config-browser/showConfig.ftl b/plugins/config-browser/src/main/resources/config-browser/showConfig.ftl
index 7daff47..1c4354e 100644
--- a/plugins/config-browser/src/main/resources/config-browser/showConfig.ftl
+++ b/plugins/config-browser/src/main/resources/config-browser/showConfig.ftl
@@ -39,11 +39,11 @@
</table>
<!-- URLTag is faulty -->
-<@s.url var="url" action="showConfig" includeParams="none">
+<@s.url var="url" action="showConfig" includeParams="none" escapeAmp="false">
<@s.param name="namespace">${namespace}</...@s.param>
<@s.param name="actionName">${actionName}</...@s.param>
</...@s.url>
-<#assign url = url + "&detailView=">
+<#assign url = url + "&detailView=">
<!-- Set all to false -->
<#assign detailsSelected = false>
<#assign exceptionsSelected = false>