java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java | 3
++
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 4
+--
java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp | 12
+++++++---
3 files changed, 14 insertions(+), 5 deletions(-)
New commits:
commit 89761c4952df4b549beefccf1ecf34fa37f2891e
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Oct 25 11:13:38 2012 +0200
WebUI - link to erratas that affect package on its overview page
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java
index b94830c..1fe0ba4 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java
@@ -136,6 +136,9 @@ public class PackageDetailsAction extends RhnAction {
PackageFactory.findPackagesWithDifferentArch(pkg));
request.setAttribute("pid", pid);
+ request.setAttribute("erratumEmpty",
pkg.getPublishedErrata().isEmpty());
+ request.setAttribute("erratum", pkg.getPublishedErrata());
+
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
PackageListItem item =
PackageListItem.parse(request.getParameter("id_combo"));
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 d284688..d687fac 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
@@ -20463,8 +20463,8 @@ given channel.</source>
<source>Errata</source>
</trans-unit>
- <trans-unit id="package.jsp.erratasearch">
- <source>Search Google for errata</source>
+ <trans-unit id="package.jsp.errataunavailable">
+ <source>No errata are available for this package</source>
</trans-unit>
<trans-unit id="package.jsp.sunosrelease">
diff --git a/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp
b/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp
index 9fc9967..cbd1490 100644
--- a/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp
+++ b/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp
@@ -240,9 +240,15 @@
<th>
<bean:message key="package.jsp.errata" />:
</th>
- <td><a
href="http://www.google.com/search?q=${package_name}+inurl:errata+si...
target="_blank">
- <bean:message key="package.jsp.erratasearch" />
- </a></td>
+ <td>
+ <c:forEach items="${erratum}" var="tmpErrata">
+ <a
href="/rhn/errata/details/Details.do?eid=${tmpErrata.id}"><c:out
value="${tmpErrata.advisory}" /></a>
+ </br>
+ </c:forEach>
+ <c:if test="${erratumEmpty == true}">
+ <bean:message key="package.jsp.errataunavailable" />
+ </c:if>
+ </td>
<tr/>