java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java | 1 + java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 7 +++++++ java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 8 ++++++++ 3 files changed, 16 insertions(+)
New commits: commit de11cdf77ee68249f86c5682dc5d692fc63889ef Author: Tomas Kasparek tkasparek@redhat.com Date: Mon Oct 22 10:56:24 2012 +0200
WebUI improvement, showing activation key used for system activation at system overview page.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java index 97ed13e..96d9f2f 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java @@ -138,6 +138,7 @@ public class SystemOverviewAction extends RhnAction { request.setAttribute("system", s); request.setAttribute("hasLocation", !(s.getLocation() == null || s.getLocation().isEmpty())); + request.setAttribute("activationKey", SystemManager.getActivationKeys(s)); 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 6a221d6..ec427f5 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 @@ -17661,6 +17661,13 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa </context-group> </trans-unit>
+ <trans-unit id="sdc.details.overview.activationkey"> + <source>Activation Key:</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/details/Overview.do</context> + </context-group> + </trans-unit> + <trans-unit id="sdc.details.overview.lockstatus"> <source>Lock Status:</source> <context-group name="ctx"> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp index 123bddf..b1fa53b 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp @@ -170,6 +170,14 @@ <th><bean:message key="sdc.details.overview.sysid"/></th> <td><c:out value="${system.id}" /></td> </tr> + <tr> + <th><bean:message key="sdc.details.overview.activationkey"/></th> + <td> + <c:forEach items="${activationKey}" var="key"> + <c:out value="${key.token}" /></br> + </c:forEach> + </td> + </tr> <tr> <th><bean:message key="sdc.details.overview.lockstatus"/></th> <td>
spacewalk-commits@lists.fedorahosted.org