java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java | 2
java/code/src/com/redhat/rhn/frontend/dto/XccdfRuleResultDto.java | 11 +
java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultCounts.java | 2
java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultDto.java | 8 +
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 60
++++++++++
java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp | 2
java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp | 6 -
java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list.jspf | 2
java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp | 2
9 files changed, 91 insertions(+), 4 deletions(-)
New commits:
commit 67d77aa305799c670d8fdef241de2ca3a7a38b53
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Tue Jun 26 11:39:05 2012 +0200
Each dataset must have a different name.
Otherwise the elaborator (once bind to that name) remains
in the session. Even after another dataset has been assigned to.
Causing the consequent CSV export to fail.
Addressing:
com.redhat.rhn.common.db.datasource.MapColumnNotFoundException: Column, xid, not found
in driving query results
at
com.redhat.rhn.common.db.datasource.CachedStatement.executeElaboratorBatch(CachedStatement.java:378)
at
com.redhat.rhn.common.db.datasource.CachedStatement.executeElaborator(CachedStatement.java:352)
at com.redhat.rhn.common.db.datasource.SelectMode.elaborate(SelectMode.java:169)
at
com.redhat.rhn.common.db.datasource.ModeElaborator.elaborate(ModeElaborator.java:48)
at
com.redhat.rhn.frontend.action.CSVDownloadAction.getStreamInfo(CSVDownloadAction.java:188)
at org.apache.struts.actions.DownloadAction.execute(DownloadAction.java:104)
at
com.redhat.rhn.frontend.action.CSVDownloadAction.execute(CSVDownloadAction.java:61)
at
org.apache.struts.action.RequestProcessor.processActionPerform(RequestProcessor.java:425)
at org.apache.struts.action.RequestProcessor.process(RequestProcessor.java:228)
at
com.redhat.rhn.frontend.struts.RhnRequestProcessor.process(RhnRequestProcessor.java:99)
at org.apache.struts.action.ActionServlet.process(ActionServlet.java:1913)
at org.apache.struts.action.ActionServlet.doGet(ActionServlet.java:449)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:617)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:717)
(...)
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java
b/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java
index 9c09ce7..0b87f05 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java
@@ -146,7 +146,7 @@ public class XccdfSearchAction extends RhnAction {
request.setAttribute(RequestContext.PAGE_LIST,
results != null ? results : Collections.EMPTY_LIST);
if (isTestestResultRequested(form) && results != null) {
- TagHelper.bindElaboratorTo("searchResults",
results.getElaborator(),
+ TagHelper.bindElaboratorTo("searchResultsTr",
results.getElaborator(),
request);
}
}
diff --git a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
index baa30ac..43de22c 100644
--- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
@@ -119,10 +119,10 @@
<rhn:csrf/>
<c:choose>
<c:when test="${param.show_as == 'tr'}">
- <rl:list emptykey="generic.jsp.none" name="searchResults"
dataset="pageList">
+ <rl:list emptykey="generic.jsp.none"
name="searchResultsTr" dataset="pageList">
<%@ include
file="/WEB-INF/pages/common/fragments/audit/xccdf-easy-list.jspf" %>
</rl:list>
- <rl:csv dataset="pageList" name="searchResults"
+ <rl:csv dataset="pageList" name="searchResultsTr"
exportColumns="id,sid,serverName,profile,satisfied,dissatisfied,satisfactionUnknown"/>
</c:when>
commit a3222f6189a91240fa55ac4b2add1ab2ed0fc979
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Fri Jun 22 13:31:58 2012 +0200
Add CSV downloader for scap search page.
diff --git a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
index 8aa62f6..baa30ac 100644
--- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
@@ -122,6 +122,8 @@
<rl:list emptykey="generic.jsp.none" name="searchResults"
dataset="pageList">
<%@ include
file="/WEB-INF/pages/common/fragments/audit/xccdf-easy-list.jspf" %>
</rl:list>
+ <rl:csv dataset="pageList" name="searchResults"
+
exportColumns="id,sid,serverName,profile,satisfied,dissatisfied,satisfactionUnknown"/>
</c:when>
<c:otherwise>
@@ -129,6 +131,8 @@
<rl:decorator name="PageSizeDecorator"/>
<%@ include
file="/WEB-INF/pages/common/fragments/audit/rule-common-columns.jspf" %>
</rl:list>
+ <rl:csv dataset="pageList" name="searchResults"
+ exportColumns="id,documentIdref,identsString,evaluationResult"/>
</c:otherwise>
</c:choose>
commit 3fa1381b08adcf340c4d793630515a3bb0699673
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Fri Jun 22 11:32:17 2012 +0200
Add CSV downloader to all-scans page
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultCounts.java
b/java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultCounts.java
index 9cdcd1a..2624792 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultCounts.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultCounts.java
@@ -21,7 +21,7 @@ import java.util.List;
* Simple DTO for transfering data from the DB to the UI through datasource.
* @version $Rev$
*/
-public abstract class XccdfTestResultCounts {
+public abstract class XccdfTestResultCounts extends BaseDto {
private static final String PASS_LABEL = "pass";
private static final String FAIL_LABEL = "fail";
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultDto.java
b/java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultDto.java
index 1397c1b..ec1a710 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultDto.java
@@ -46,6 +46,14 @@ public class XccdfTestResultDto extends XccdfTestResultCounts {
}
/**
+ * Returs id of xccdf:TestResult
+ * @return the xid
+ */
+ public Long getId() {
+ return getXid();
+ }
+
+ /**
* Returns id of targeted system
* @return the sid
*/
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index 238aa7d..4cb60c5 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -7772,6 +7772,19 @@ Follow this url to see the full list of inactive systems:
<source>Result of Evaluation</source>
</trans-unit>
+ <trans-unit id="profile">
+ <source>Idref of Profile</source>
+ </trans-unit>
+ <trans-unit id="satisfied">
+ <source>Satisfied</source>
+ </trans-unit>
+ <trans-unit id="dissatisfied">
+ <source>Dissatisfied</source>
+ </trans-unit>
+ <trans-unit id="satisfactionUnknown">
+ <source>Unknown</source>
+ </trans-unit>
+
<trans-unit id="listtag.clearfilter">
<source>Clear filter </source>
diff --git a/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp
b/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp
index 30ce4c8..21c9cf5 100644
--- a/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp
@@ -23,6 +23,8 @@
<rl:list emptykey="audit.listxccdf.jsp.noscans">
<%@ include
file="/WEB-INF/pages/common/fragments/audit/xccdf-easy-list.jspf" %>
</rl:list>
+ <rl:csv name="groupSet"
+
exportColumns="id,sid,serverName,profile,satisfied,dissatisfied,satisfactionUnknown"/>
<rhn:tooltip key="audit.listxccdf.jsp.tooltip"/>
</rl:listset>
commit cb1eb06ea399f3db6b0faf857bf62c25861e67ea
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu Jun 21 16:19:30 2012 +0200
Add CSV downloader for scan's details page
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/XccdfRuleResultDto.java
b/java/code/src/com/redhat/rhn/frontend/dto/XccdfRuleResultDto.java
index 6865840..92d0496 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/XccdfRuleResultDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/XccdfRuleResultDto.java
@@ -25,7 +25,7 @@ import com.redhat.rhn.manager.audit.ScapManager;
* Simple DTO for transfering data from the DB to the UI through datasource.
* @version $Rev$
*/
-public class XccdfRuleResultDto {
+public class XccdfRuleResultDto extends BaseDto {
private Long id;
private String label;
@@ -57,6 +57,15 @@ public class XccdfRuleResultDto {
}
/**
+ * Returns the actual xccdf:rule-result result
+ * @return the result
+ */
+ public String getEvaluationResult() {
+ // this method serve only for better localization within CSVWriter
+ return getLabel();
+ }
+
+ /**
* Sets the actual xccdf:rule-result result
* @param labelIn to set
*/
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index 986c5ea..238aa7d 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -7762,6 +7762,16 @@ Follow this url to see the full list of inactive systems:
<source>Total</source>
</trans-unit>
+ <trans-unit id="documentIdref">
+ <source>Idref of rule-result</source>
+ </trans-unit>
+ <trans-unit id="identsString">
+ <source>Assigned Idents</source>
+ </trans-unit>
+ <trans-unit id="evaluationResult">
+ <source>Result of Evaluation</source>
+ </trans-unit>
+
<trans-unit id="listtag.clearfilter">
<source>Clear filter </source>
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 6248806..fa07347 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
@@ -79,6 +79,8 @@
<%@ include
file="/WEB-INF/pages/common/fragments/audit/rule-common-columns.jspf" %>
</rl:list>
+ <rl:csv name="groupSet"
+ exportColumns="id,documentIdref,identsString,evaluationResult"/>
</rl:listset>
</body>
commit 582780437e7b97b606620fa5f22f7eb62a3bf609
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu Jun 21 15:10:31 2012 +0200
Add CSV downloader for system's scans page
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index 795d821..986c5ea 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -7725,6 +7725,43 @@ Follow this url to see the full list of inactive systems:
<source>Matching Field Value</source>
</trans-unit>
+ <trans-unit id="testResult">
+ <source>Idref of TestResult</source>
+ </trans-unit>
+ <trans-unit id="completionTime">
+ <source>Completion Time</source>
+ </trans-unit>
+ <trans-unit id="pass">
+ <source>Pass</source>
+ </trans-unit>
+ <trans-unit id="fail">
+ <source>Fail</source>
+ </trans-unit>
+ <trans-unit id="error">
+ <source>Error</source>
+ </trans-unit>
+ <trans-unit id="unknown">
+ <source>Unknown</source>
+ </trans-unit>
+ <trans-unit id="notapplicable">
+ <source>Notapplicable</source>
+ </trans-unit>
+ <trans-unit id="notchecked">
+ <source>Notchecked</source>
+ </trans-unit>
+ <trans-unit id="notselected">
+ <source>Notselected</source>
+ </trans-unit>
+ <trans-unit id="informational">
+ <source>Informational</source>
+ </trans-unit>
+ <trans-unit id="fixed">
+ <source>Fixed</source>
+ </trans-unit>
+ <trans-unit id="sum">
+ <source>Total</source>
+ </trans-unit>
+
<trans-unit id="listtag.clearfilter">
<source>Clear filter </source>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list.jspf
index 4491c6e..bbadbe9 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list.jspf
@@ -84,6 +84,8 @@
</c:choose>
</rl:column>
</rl:list>
+ <rl:csv name="groupSet"
+ exportColumns="id,testResult,completionTime,pass,fail,error,unknown,notapplicable,notchecked,notselected,informational,fixed,sum"/>
</rl:listset>
<rhn:tooltip><bean:message
key="system.audit.listscap.jsp.tooltip"/></rhn:tooltip>