java/code/src/com/redhat/rhn/frontend/dto/SystemCurrency.java | 17 ++++++
java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp | 27 ++--------
java/spacewalk-java.spec | 6 +-
rel-eng/packages/spacewalk-java | 2
4 files changed, 31 insertions(+), 21 deletions(-)
New commits:
commit 58d17440df71d6b2240bf24e86b316829fb4e6db
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jul 28 21:27:44 2011 +0200
Automatic commit of package [spacewalk-java] release [1.6.6-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 3fd970f..4f28357 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.6.5
+Version: 1.6.6
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -546,6 +546,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Jul 28 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.6-1
+- 658533,722455 - sort systems according to currency score
+ (tlestach(a)redhat.com)
+
* Thu Jul 28 2011 Jan Pazdziora 1.6.5-1
- 601524 - kickstart.profile.setAdvancedCall apidoc fix (tlestach(a)redhat.com)
- 725555 - fix typo for test in c.size() to match the logging message
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 62759b5..32c68af 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.6.5-1 java/
+1.6.6-1 java/
commit 6bca7abed49cc093d55464eb61f01105ef6d68b6
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jul 28 20:40:11 2011 +0200
658533,722455 - sort systems according to currency score
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/SystemCurrency.java
b/java/code/src/com/redhat/rhn/frontend/dto/SystemCurrency.java
index 903b0c6..5bd7cd2 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/SystemCurrency.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/SystemCurrency.java
@@ -14,6 +14,8 @@
*/
package com.redhat.rhn.frontend.dto;
+import com.redhat.rhn.common.conf.ConfigDefaults;
+
import java.io.Serializable;
import java.util.Date;
@@ -24,6 +26,14 @@ import java.util.Date;
*/
public class SystemCurrency extends BaseDto implements Serializable {
+ private static Integer scCrit = ConfigDefaults.get().getSCCrit();
+ private static Integer scImp = ConfigDefaults.get().getSCImp();
+ private static Integer scMod = ConfigDefaults.get().getSCMod();
+ private static Integer scLow = ConfigDefaults.get().getSCLow();
+ private static Integer scBug = ConfigDefaults.get().getSCBug();
+ private static Integer scEnh = ConfigDefaults.get().getSCEnh();
+
+
private String statusDisplay;
private Long id;
private Long critical;
@@ -171,4 +181,11 @@ public class SystemCurrency extends BaseDto implements Serializable
{
this.modified = modifiedIn;
}
+ /**
+ * @return returns final score
+ */
+ public Long getScore() {
+ return this.enhancement * scEnh + this.bug * scBug + this.low * scLow +
+ this.moderate * scMod + this.important * scImp + this.critical * scCrit;
+ }
}
diff --git a/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp
b/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp
index 9e59e8b..5e094ed 100644
--- a/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp
@@ -54,8 +54,7 @@
<rl:column sortable="true"
bound="false"
headerkey="systemcurrency.jsp.critical"
- sortattr="critical"
- defaultsort="desc">
+ sortattr="critical">
<c:choose>
<c:when test="${current.critical > 0}">
<a
href="/rhn/systems/details/ErrataList.do?sid=${current.id}&type=${rhn:localize('errata.create.securityadvisory.crit')}">${current.critical}</a>
@@ -77,8 +76,7 @@
<rl:column sortable="true"
bound="false"
headerkey="systemcurrency.jsp.important"
- sortattr="important"
- defaultsort="desc">
+ sortattr="important">
<c:choose>
<c:when test="${current.important > 0}">
<a
href="/rhn/systems/details/ErrataList.do?sid=${current.id}&type=${rhn:localize('errata.create.securityadvisory.imp')}">${current.important}</a>
@@ -100,8 +98,7 @@
<rl:column sortable="true"
bound="false"
headerkey="systemcurrency.jsp.moderate"
- sortattr="moderate"
- defaultsort="desc">
+ sortattr="moderate">
<c:choose>
<c:when test="${current.moderate > 0}">
<a
href="/rhn/systems/details/ErrataList.do?sid=${current.id}&type=${rhn:localize('errata.create.securityadvisory.mod')}">${current.moderate}</a>
@@ -123,8 +120,7 @@
<rl:column sortable="true"
bound="false"
headerkey="systemcurrency.jsp.low"
- sortattr="low"
- defaultsort="desc">
+ sortattr="low">
<c:choose>
<c:when test="${current.low > 0}">
<a
href="/rhn/systems/details/ErrataList.do?sid=${current.id}&type=${rhn:localize('errata.create.securityadvisory.low')}">${current.low}</a>
@@ -146,8 +142,7 @@
<rl:column sortable="true"
bound="false"
headerkey="systemcurrency.jsp.bug"
- sortattr="bug"
- defaultsort="desc">
+ sortattr="bug">
<c:choose>
<c:when test="${current.bug > 0}">
<a
href="/rhn/systems/details/ErrataList.do?sid=${current.id}&type=${rhn:localize('errata.create.bugfixadvisory')}">${current.bug}</a>
@@ -161,8 +156,7 @@
<rl:column sortable="true"
bound="false"
headerkey="systemcurrency.jsp.enhancement"
- sortattr="enhancement"
- defaultsort="desc">
+ sortattr="enhancement">
<c:choose>
<c:when test="${current.enhancement >
0}">
<a
href="/rhn/systems/details/ErrataList.do?sid=${current.id}&type=${rhn:localize('errata.create.productenhancementadvisory')}">${current.enhancement}</a>
@@ -176,15 +170,10 @@
<rl:column sortable="true"
bound="false"
headerkey="systemcurrency.jsp.score"
- sortattr="created"
+ sortattr="score"
styleclass="last-column"
defaultsort="desc">
- <c:out value="${current.enhancement * $scEnh +
- current.bug * scBug +
- current.low * scLow +
- current.moderate * scMod +
- current.important * scImp +
- current.critical * scCrit}"/>
+ <c:out value="${current.score}" />
</rl:column>
</rl:list>
</rl:listset>