java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfDiffSubmitAction.java | 8
+-
java/code/src/com/redhat/rhn/frontend/action/systems/audit/ListScapAction.java | 31
+++++++++-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 9
++
java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list.jspf | 5
+
java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp | 4
+
java/code/webapp/WEB-INF/struts-config.xml | 2
6 files changed, 54 insertions(+), 5 deletions(-)
New commits:
commit 8eb0228abc050c9295605260a0de16a92fdc2b7c
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Tue Aug 6 09:21:36 2013 +0200
982354 - Show Scan's ID (xid) on scan's details page.
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 1362909..be2f763 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -11103,6 +11103,9 @@ the <strong>Red Hat Enterprise Linux System
Administration Guide.</stro
<trans-unit id="system.audit.xccdfdetails.jsp.header">
<source>Details of XCCDF Scan</source>
</trans-unit>
+ <trans-unit id="system.audit.xccdfdetails.jsp.id">
+ <source>Scan ID (xid)</source>
+ </trans-unit>
<trans-unit id="system.audit.xccdfdetails.jsp.path">
<source>File System Path</source>
</trans-unit>
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 771c10d..9fc9e40 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
@@ -49,6 +49,10 @@
<table class="details">
<tr>
+ <th><bean:message
key="system.audit.xccdfdetails.jsp.id"/>:</th>
+ <td><c:out value="${testResult.id}"/></td>
+ </tr>
+ <tr>
<th><bean:message
key="system.audit.xccdfdetails.jsp.path"/>:</th>
<td><c:out
value="${testResult.scapActionDetails.path}"/></td>
</tr>
commit 0a730e63d9458faf3d83d7c494443cb5537b0cd5
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Mon Aug 5 18:35:18 2013 +0200
Refactor: Use static-final instead of magic constant.
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfDiffSubmitAction.java
b/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfDiffSubmitAction.java
index 0dcb31d..d39dc36 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfDiffSubmitAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfDiffSubmitAction.java
@@ -46,11 +46,11 @@ import com.redhat.rhn.manager.audit.scap.TestResultDiffer;
* Static action page.
*/
public class XccdfDiffSubmitAction extends RhnAction implements Listable {
- private static final String FIRST = "first";
- private static final String SECOND = "second";
- private static final String VIEW = "view";
+ public static final String FIRST = "first";
+ public static final String SECOND = "second";
+ public static final String VIEW = "view";
+ public static final String CHANGED = "changed";
private static final String FULL = "full";
- private static final String CHANGED = "changed";
private static final String MISSING_MSG = "message.xccdfdiff.missing";
/** {@inheritDoc} */
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/systems/audit/ListScapAction.java
b/java/code/src/com/redhat/rhn/frontend/action/systems/audit/ListScapAction.java
index 81ae8c0..1ac704e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/audit/ListScapAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/audit/ListScapAction.java
@@ -32,6 +32,7 @@ import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.domain.rhnset.RhnSet;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.action.audit.scap.XccdfDiffSubmitAction;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListSetHelper;
@@ -97,14 +98,14 @@ public class ListScapAction extends ScapSetupAction {
else if (context.wasDispatched(DIFF_BUT)) {
if (selectionSize == 2) {
Map<String, Object> params = new HashMap<String, Object>();
- params.put("view", "changed");
+ params.put(XccdfDiffSubmitAction.VIEW, XccdfDiffSubmitAction.CHANGED);
Set<Long> scanIds = (Set<Long>) set.getElementValues();
Iterator<Long> it = scanIds.iterator();
if (it.hasNext()) {
- params.put("first", it.next());
+ params.put(XccdfDiffSubmitAction.FIRST, it.next());
}
if (it.hasNext()) {
- params.put("second", it.next());
+ params.put(XccdfDiffSubmitAction.SECOND, it.next());
}
return
getStrutsDelegate().forwardParams(mapping.findForward("submitDiff"),
params);
commit 4510a00e7f866c209e450afb0b959d8b17057b08
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Mon Aug 5 18:01:14 2013 +0200
982354 - enable easy comparison between various SCAP scans.
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/systems/audit/ListScapAction.java
b/java/code/src/com/redhat/rhn/frontend/action/systems/audit/ListScapAction.java
index 8335883..81ae8c0 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/audit/ListScapAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/audit/ListScapAction.java
@@ -15,7 +15,9 @@
package com.redhat.rhn.frontend.action.systems.audit;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
+import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -23,6 +25,8 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.domain.rhnset.RhnSet;
@@ -45,6 +49,7 @@ import com.redhat.rhn.manager.rhnset.RhnSetManager;
public class ListScapAction extends ScapSetupAction {
private static final String LIST_NAME = "xccdfScans";
private static final String DELET_BUT =
"system.audit.listscap.jsp.removebut";
+ private static final String DIFF_BUT =
"system.audit.listscap.jsp.diffbut";
/**
* {@inheritDoc}
@@ -82,12 +87,35 @@ public class ListScapAction extends ScapSetupAction {
request.getRequestURI() + "?sid=" + sid);
request.setAttribute(RequestContext.PAGE_LIST, result);
- if (context.wasDispatched(DELET_BUT) && getSetDecl(sid).get(user).size()
> 0) {
+ int selectionSize = set.size();
+ if (context.wasDispatched(DELET_BUT) && selectionSize > 0) {
Map<String, Long> params = new HashMap<String, Long>();
params.put("sid", sid);
return
getStrutsDelegate().forwardParams(mapping.findForward("submitDelete"),
params);
}
+ else if (context.wasDispatched(DIFF_BUT)) {
+ if (selectionSize == 2) {
+ Map<String, Object> params = new HashMap<String, Object>();
+ params.put("view", "changed");
+ Set<Long> scanIds = (Set<Long>) set.getElementValues();
+ Iterator<Long> it = scanIds.iterator();
+ if (it.hasNext()) {
+ params.put("first", it.next());
+ }
+ if (it.hasNext()) {
+ params.put("second", it.next());
+ }
+ return
getStrutsDelegate().forwardParams(mapping.findForward("submitDiff"),
+ params);
+ }
+ else {
+ ActionMessages msg = new ActionMessages();
+ msg.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
+ "system.audit.listscap.jsp.diffmessage"));
+ getStrutsDelegate().saveMessages(request, msg);
+ }
+ }
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 5a8b772..1362909 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -11072,6 +11072,12 @@ the <strong>Red Hat Enterprise Linux System
Administration Guide.</stro
<trans-unit id="system.audit.listscap.jsp.removebut">
<source>Remove Selected Scans</source>
</trans-unit>
+ <trans-unit id="system.audit.listscap.jsp.diffbut">
+ <source>Compare Selected Scans</source>
+ </trans-unit>
+ <trans-unit id="system.audit.listscap.jsp.diffmessage">
+ <source>To make comparison please select exactly two
scans.</source>
+ </trans-unit>
</group>
<group>
<context-group name="ctx">
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 e38e9bd..9a02d5a 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
@@ -44,6 +44,11 @@
exportColumns="xid,testResult,completed,pass,fail,error,unknown,notapplicable,notchecked,notselected,informational,fixed,sum"/>
<p align="right">
+ <input type="submit" name="dispatch"
value="<bean:message key="system.audit.listscap.jsp.diffbut"/>"
+ <c:choose>
+ <c:when test="${empty pageList}">disabled</c:when>
+ </c:choose>
+ >
<input type="submit" name="dispatch"
value="<bean:message
key="system.audit.listscap.jsp.removebut"/>"
<c:choose>
<c:when test="${empty pageList}">disabled</c:when>
diff --git a/java/code/webapp/WEB-INF/struts-config.xml
b/java/code/webapp/WEB-INF/struts-config.xml
index e6059c6..8682ba5 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -3002,6 +3002,8 @@
path="/WEB-INF/pages/systems/details/audit/listscap.jsp"/>
<forward name="submitDelete"
path="/systems/details/audit/XccdfDeleteConfirm.do"
redirect="true"/>
+ <forward name="submitDiff"
+ path="/audit/scap/DiffSubmit.do" redirect="true"/>
</action>
<action path="/systems/details/audit/XccdfDeleteConfirm"