java/code/src/com/redhat/rhn/common/db/datasource/xml/Crash_queries.xml | 2 - java/code/src/com/redhat/rhn/frontend/dto/IdenticalCrashesDto.java | 12 +++++----- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 9 +++++++ java/code/webapp/WEB-INF/pages/systems/softwarecrashesoverview.jsp | 6 ++--- 4 files changed, 19 insertions(+), 10 deletions(-)
New commits: commit dd3103e183a3558651c4d6c5197464a5be53801d Author: Milan Zazrivec mzazrivec@redhat.com Date: Fri Mar 22 11:34:32 2013 +0100
abrt: properly export csv columns for crash overview
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Crash_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Crash_queries.xml index e813acd..17ef299 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Crash_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Crash_queries.xml @@ -5,7 +5,7 @@ select sc.uuid as uuid, count(distinct sc.server_id) as system_count, sum(sc.count) as total_crash_count, - max(sc.modified) as last_report + max(sc.modified) as last_crash_report from rhnServerCrash sc, rhnServer s, rhnUserServerPerms usp diff --git a/java/code/src/com/redhat/rhn/frontend/dto/IdenticalCrashesDto.java b/java/code/src/com/redhat/rhn/frontend/dto/IdenticalCrashesDto.java index c31f969..03baea3 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/IdenticalCrashesDto.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/IdenticalCrashesDto.java @@ -27,7 +27,7 @@ public class IdenticalCrashesDto extends BaseDto { private String uuid; private long totalCrashCount; private long systemCount; - private Date lastReport; + private Date lastCrashReport;
/** * Returns id @@ -97,15 +97,15 @@ public class IdenticalCrashesDto extends BaseDto { * Returns the date last of last crash report. * @return the date last of last crash report. */ - public Date getLastReport() { - return lastReport; + public Date getLastCrashReport() { + return lastCrashReport; }
/** * Sets the date of last crash report. - * @param lastReportIn the date of last crash report. + * @param lastCrashReportIn the date of last crash report. */ - public void setLastReport(Date lastReportIn) { - lastReport = lastReportIn; + public void setLastCrashReport(Date lastCrashReportIn) { + lastCrashReport = lastCrashReportIn; } } 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 94ecced..8bb39af 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 @@ -15850,6 +15850,15 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa <trans-unit id="exportcolumn.path"> <source>Path</source> </trans-unit> + <trans-unit id="exportcolumn.uuid"> + <source>UUID</source> + </trans-unit> + <trans-unit id="exportcolumn.totalCrashCount"> + <source>Total Crash Count</source> + </trans-unit> + <trans-unit id="exportcolumn.lastCrashReport"> + <source>Last Crash Occurence</source> + </trans-unit> </group> <trans-unit id="virtualization.provision.first.jsp.no.profiles"> <source>No profiles currently available for kickstarting guests. Please <a href="/rhn/kickstart/CreateProfileWizard.do">create a new kickstart profile with a Virtualization Type other than none.</a></source> diff --git a/java/code/webapp/WEB-INF/pages/systems/softwarecrashesoverview.jsp b/java/code/webapp/WEB-INF/pages/systems/softwarecrashesoverview.jsp index 17bb1df..732b6a8 100644 --- a/java/code/webapp/WEB-INF/pages/systems/softwarecrashesoverview.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/softwarecrashesoverview.jsp @@ -49,14 +49,14 @@ </rl:column> <rl:column headerkey="crashes.jsp.lastoccurence" bound="false" - sortattr="lastReport" + sortattr="lastCrashReport" sortable="true"> - ${current.lastReport} + ${current.lastCrashReport} </rl:column> </rl:list> </div> <rl:csv name="identicalCrashes" - exportColumns="uuid,totalCrashCount,systemCount,lastReport" /> + exportColumns="uuid,totalCrashCount,systemCount,lastCrashReport" /> </rl:listset> </body> </html>