java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2
java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 42
+++++-----
2 files changed, 23 insertions(+), 21 deletions(-)
New commits:
commit e702a8a9546fb04c59efad5365e4a1f99ec474e8
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Jan 16 14:24:02 2013 +0100
display abrt summary only if spacewalk-abrt is installed
spacewalk-abrt brings abrt.check capability.
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 b1fa53b..7e2233f 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
@@ -353,26 +353,28 @@
</tr>
</table>
</div>
- <div style="width: 45%; float: left;">
- <h2><bean:message
key="sdc.details.overview.crashes.application"/></h2>
- <table class="details">
- <c:choose>
- <c:when test="${system.crashes.created == null}">
- <bean:message key="sdc.details.overview.crashes.nodata"/>
- </c:when>
- <c:otherwise>
- <tr>
- <th><bean:message
key="sdc.details.overview.crashes.lastreport"/></th>
- <td><fmt:formatDate value="${system.crashes.created}"
type="both" dateStyle="short"
timeStyle="long"/></td>
- </tr>
- <tr>
- <th><bean:message
key="sdc.details.overview.crashes.crashcount"/></th>
- <td><c:out
value="${system.crashes.crashCount}"/></td>
- </tr>
- </c:otherwise>
- </c:choose>
- </table>
- </div>
+ <rhn:require acl="client_capable(abrt.check);"
mixins="com.redhat.rhn.common.security.acl.SystemAclHandler">
+ <div style="width: 45%; float: left;">
+ <h2><bean:message
key="sdc.details.overview.crashes.application"/></h2>
+ <table class="details">
+ <c:choose>
+ <c:when test="${system.crashes.created == null}">
+ <bean:message key="sdc.details.overview.crashes.nodata"/>
+ </c:when>
+ <c:otherwise>
+ <tr>
+ <th><bean:message
key="sdc.details.overview.crashes.lastreport"/></th>
+ <td><fmt:formatDate value="${system.crashes.created}"
type="both" dateStyle="short"
timeStyle="long"/></td>
+ </tr>
+ <tr>
+ <th><bean:message
key="sdc.details.overview.crashes.crashcount"/></th>
+ <td><c:out
value="${system.crashes.crashCount}"/></td>
+ </tr>
+ </c:otherwise>
+ </c:choose>
+ </table>
+ </div>
+ </rhn:require>
<div style="clear: left; width: 45%; float: left; line-height: 200%">
<h2><bean:message key="sdc.details.overview.subscribedchannels"
arg0="/rhn/systems/details/SystemChannels.do?sid=${system.id}"/></h2>
commit 8fd47d59c86615653e6e52b3a4b089a0981560b9
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Jan 16 14:18:13 2013 +0100
abrt: correct webui message
No crash data available for the system doesn't imply spacewalk-abrt is not
installed.
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 0d4cf8b..814c1d9 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
@@ -16241,7 +16241,7 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer
Generation should alwa
</context-group>
</trans-unit>
<trans-unit id="sdc.details.overview.crashes.nodata">
- <source>To get application crash data install spacewalk-abrt on this
system.</source>
+ <source>No crash data has been reported for this system
yet.</source>
<context-group name="ctx">
<context
context-type="sourcefile">/systems/details/Overview.do</context>
</context-group>
Show replies by date