java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf | 26
+++++-----
java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp | 18
+++---
2 files changed, 24 insertions(+), 20 deletions(-)
New commits:
commit e44ce3c3af971dace97de1c397540a5e0c9245af
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Fri Jan 24 09:57:37 2014 +0100
1057294 - Wrap choise by <c:choose>
Addressing (Internal Server Error):
Caused by: javax.servlet.jsp.JspTagException: Illegal use of
<when>-style tag without <choose> as its direct parent
at org.apache.taglibs.standard.tag.common.core.WhenTagSupport.doStartTag(Unknown
Source)
at
org.apache.jsp.WEB_002dINF.pages.systems.details.audit.listscap_jsp._jspx_meth_c_005fwhen_005f5(Unknown
Source)
at
org.apache.jsp.WEB_002dINF.pages.systems.details.audit.listscap_jsp._jspx_meth_c_005fwhen_005f4(Unknown
Source)
at
org.apache.jsp.WEB_002dINF.pages.systems.details.audit.listscap_jsp._jspx_meth_c_005fchoose_005f3(Unknown
Source)
at
org.apache.jsp.WEB_002dINF.pages.systems.details.audit.listscap_jsp._jspx_meth_rl_005fcolumn_005f0(Unknown
Source)
at
org.apache.jsp.WEB_002dINF.pages.systems.details.audit.listscap_jsp._jspx_meth_rl_005flist_005f0(Unknown
Source)
at
org.apache.jsp.WEB_002dINF.pages.systems.details.audit.listscap_jsp._jspx_meth_rl_005flistset_005f0(Unknown
Source)
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf
index 2cdf510..b0bb899 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list-columns.jspf
@@ -2,18 +2,20 @@
<c:choose>
<c:when test="${not empty current.comparableId}">
<a
href="/rhn/audit/scap/DiffSubmit.do?first=${current.comparableId}&second=${current.xid}&view=changed">
- <c:when test="${current.diffIcon ==
'checked'}" >
- <rhn:icon type="system-ok"
title="scapdiff.jsp.i.checked" />
- </c:when>
- <c:when test="${current.diffIcon ==
'alert'}" >
- <rhn:icon type="system-warn"
title="scapdiff.jsp.i.alert" />
- </c:when>
- <c:when test="${current.diffIcon ==
'error'}" >
- <rhn:icon type="system-crit"
title="scapdiff.jsp.i.error" />
- </c:when>
- <c:otherwise>
- <rhn:icon type="system-unknown"
title="system.audit.xccdfdetails.jsp.nodiff" />
- </c:otherwise>
+ <c:choose>
+ <c:when test="${current.diffIcon == 'checked'}" >
+ <rhn:icon type="system-ok" title="scapdiff.jsp.i.checked"
/>
+ </c:when>
+ <c:when test="${current.diffIcon == 'alert'}" >
+ <rhn:icon type="system-warn" title="scapdiff.jsp.i.alert"
/>
+ </c:when>
+ <c:when test="${current.diffIcon == 'error'}" >
+ <rhn:icon type="system-crit" title="scapdiff.jsp.i.error"
/>
+ </c:when>
+ <c:otherwise>
+ <rhn:icon type="system-unknown"
title="system.audit.xccdfdetails.jsp.nodiff" />
+ </c:otherwise>
+ </c:choose>
</a>
</c:when>
<c:otherwise>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
index ae2e158..c706a7f 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
@@ -16,18 +16,20 @@
<c:choose>
<c:when test="${not empty testResult.comparableId}">
<a
href="/rhn/audit/scap/DiffSubmit.do?first=${testResult.comparableId}&second=${testResult.id}&view=changed">
- <c:when test="${testResult.diffIcon == 'checked'}" >
+ <c:choose>
+ <c:when test="${testResult.diffIcon == 'checked'}" >
<rhn:icon type="system-ok"
title="scapdiff.jsp.i.checked" />
- </c:when>
- <c:when test="${testResult.diffIcon == 'alert'}" >
+ </c:when>
+ <c:when test="${testResult.diffIcon == 'alert'}" >
<rhn:icon type="system-warn"
title="scapdiff.jsp.i.alert" />
- </c:when>
- <c:when test="${testResult.diffIcon == 'error'}" >
+ </c:when>
+ <c:when test="${testResult.diffIcon == 'error'}" >
<rhn:icon type="system-crit"
title="scapdiff.jsp.i.error" />
- </c:when>
- <c:otherwise>
+ </c:when>
+ <c:otherwise>
<rhn:icon type="system-unknown"
title="system.audit.xccdfdetails.jsp.nodiff" />
- </c:otherwise>
+ </c:otherwise>
+ </c:choose>
<bean:message key="system.audit.xccdfdetails.jsp.diff"/>
</a>
</c:when>
Show replies by date