java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 6 ++++++
java/code/webapp/WEB-INF/pages/keys/keys.jsp | 6 ++++++
2 files changed, 12 insertions(+)
New commits:
commit e5dbc1328ea97047d8f28177d94c292fff418428
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jan 16 15:29:50 2013 +0100
For RHN-ORG-TRUSTED-SSL-CERT, inform that it will be copied over to new orgs.
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 814c1d9..4a24e27 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
@@ -9137,6 +9137,12 @@ Please note that some manual configuration of these scripts may
still be require
<context
context-type="sourcefile">/rhn/keys/CryptoKeysList.do</context>
</context-group>
</trans-unit>
+ <trans-unit id="keys.jsp.default-ssl-key-copy">
+ <source>This key/cert will be copied over to newly created
organizations.</source>
+ <context-group name="ctx">
+ <context
context-type="sourcefile">/rhn/keys/CryptoKeysList.do</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="toolbar.create.keys">
<source>create new stored key/cert</source>
<context-group name="ctx">
diff --git a/java/code/webapp/WEB-INF/pages/keys/keys.jsp
b/java/code/webapp/WEB-INF/pages/keys/keys.jsp
index ca11b3a..0c4dbc8 100644
--- a/java/code/webapp/WEB-INF/pages/keys/keys.jsp
+++ b/java/code/webapp/WEB-INF/pages/keys/keys.jsp
@@ -37,6 +37,12 @@
styleclass="first-column"
sortattr="description">
<c:out value="<a
href=\"/rhn/keys/CryptoKeyEdit.do?key_id=${current.id}\">${current.description}</a>"
escapeXml="false" />
+ <rhn:require acl="user_role(satellite_admin)">
+ <c:if test="${current.description == 'RHN-ORG-TRUSTED-SSL-CERT' and
current.label == 'SSL'}">
+ <c:out value="<br/>" escapeXml="false" />
+ <bean:message key="keys.jsp.default-ssl-key-copy"/>
+ </c:if>
+ </rhn:require>
</rl:column>
<!-- Type Column -->
Show replies by date