java/code/src/com/redhat/rhn/frontend/dto/SystemCurrency.java | 7 ++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 24 ++++++++++ java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 7 -- java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp | 2 4 files changed, 34 insertions(+), 6 deletions(-)
New commits: commit 99c7184cd60344651e44e01f9be89b4bd974212e Author: Tomas Lestach tlestach@redhat.com Date: Thu Aug 18 18:42:49 2011 +0200
658533 - unify score computing for WebUI and API
this commit shall not change any functionality, just unifies score calculation
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java index 445adff..f941310 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java @@ -4754,12 +4754,7 @@ public class SystemHandler extends BaseHandler { m.put("low", s.getLow()); m.put("bug", s.getBug()); m.put("enh", s.getEnhancement()); - m.put("score", s.getCritical() * ConfigDefaults.get().getSCCrit() + - s.getImportant() * ConfigDefaults.get().getSCImp() + - s.getModerate() * ConfigDefaults.get().getSCMod() + - s.getLow() * ConfigDefaults.get().getSCLow() + - s.getBug() * ConfigDefaults.get().getSCBug() + - s.getEnhancement() * ConfigDefaults.get().getSCEnh()); + m.put("score", s.getScore()); l.add(m); }
commit 403d99934538acccfa805c14a78acf94043256b7 Author: Tomas Lestach tlestach@redhat.com Date: Thu Aug 18 16:59:39 2011 +0200
663697 - enable csv export of System Currency Report
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 5bd7cd2..ba5071f 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/SystemCurrency.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/SystemCurrency.java @@ -150,6 +150,13 @@ public class SystemCurrency extends BaseDto implements Serializable { return name; } /** + * another getter for name attribute + * @return Returns the name. + */ + public String getServerName() { + return getName(); + } + /** * @param nameIn The name to set. */ public void setName(String nameIn) { 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 cce43fd..df5889f 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 @@ -18685,6 +18685,30 @@ performing a kickstart or creating a new kickstart distribution.</strong> <trans-unit id="exportcolumn.issueDate"> <source>Issue Date</source> </trans-unit> + <trans-unit id="exportcolumn.serverName"> + <source>System</source> + </trans-unit> + <trans-unit id="exportcolumn.critical"> + <source>Security (Critical)</source> + </trans-unit> + <trans-unit id="exportcolumn.important"> + <source>Security (Important)</source> + </trans-unit> + <trans-unit id="exportcolumn.moderate"> + <source>Security (Moderate)</source> + </trans-unit> + <trans-unit id="exportcolumn.low"> + <source>Security (Low)</source> + </trans-unit> + <trans-unit id="exportcolumn.bug"> + <source>Bugfixes</source> + </trans-unit> + <trans-unit id="exportcolumn.enhancement"> + <source>Enhancements</source> + </trans-unit> + <trans-unit id="exportcolumn.score"> + <source>Score</source> + </trans-unit> </group>
<trans-unit id="virtualization.provision.first.jsp.no.profiles"> diff --git a/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp b/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp index 5e094ed..b7b2cdf 100644 --- a/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp @@ -176,6 +176,8 @@ <c:out value="${current.score}" /> </rl:column> </rl:list> + <rl:csv dataset="pageList" name="systemCurrencyList" + exportColumns="serverName, critical, important, moderate, low, bug, enhancement, score" /> </rl:listset> </body> </html>
spacewalk-commits@lists.fedorahosted.org