branding/templates
by Tomáš Kašpárek
branding/templates/footer.pxt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6686534ce4e311ec7f591c9371896ed7994a816e
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Jan 30 10:27:43 2014 +0100
update copyright year in perl footer
diff --git a/branding/templates/footer.pxt b/branding/templates/footer.pxt
index 413e695..4120e31 100644
--- a/branding/templates/footer.pxt
+++ b/branding/templates/footer.pxt
@@ -3,7 +3,7 @@
<pxt-passthrough>
<pxt-use class="Sniglets::Users" />
<div>
- Copyright © 2002‒13 Red Hat, Inc. All rights reserved.
+ Copyright © 2002‒14 Red Hat, Inc. All rights reserved.
<a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a>
: <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a>
: <a href="http://www.redhat.com/">redhat.com</a>
8 years, 5 months
java/code
by Tomáš Kašpárek
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 4 ++--
16 files changed, 30 insertions(+), 30 deletions(-)
New commits:
commit 4fc6d6256b7bc099320e7a77ca5b6affe34e9bbf
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Jan 30 10:10:34 2014 +0100
update copyright year in page footer in java
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
index 4bea1a3..5ec40f0 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
@@ -1272,7 +1272,7 @@
</trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
- <source>Copyright &#169; 2002&#x2012;13 Red Hat, Inc. All rights reserved.</source>
+ <source>Copyright &#169; 2002&#x2012;14 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
index a329e12..8f1351c 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
@@ -1354,11 +1354,11 @@
</trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
- <source>Copyright &#169; 2002&#x2012;13 Red Hat, Inc. All rights reserved.</source>
+ <source>Copyright &#169; 2002&#x2012;14 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</context>
</context-group>
- <target>Copyright &#169; 2002&#x2012;13 Red Hat, Inc. Alle Rechte vorbehalten.</target>
+ <target>Copyright &#169; 2002&#x2012;14 Red Hat, Inc. Alle Rechte vorbehalten.</target>
</trans-unit>
<trans-unit id="footer.jsp.legalStatement">
<source>Legal statement</source>
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 ba6a15c..b8626cf 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
@@ -1150,7 +1150,7 @@
</trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
- <source>Copyright &#169; 2002&#x2012;13 Red Hat, Inc. All rights reserved.</source>
+ <source>Copyright &#169; 2002&#x2012;14 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
index 33e214e..52c2a6a 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
@@ -1354,11 +1354,11 @@
</trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
- <source>Copyright &#169; 2002&#x2012;13 Red Hat, Inc. All rights reserved.</source>
+ <source>Copyright &#169; 2002&#x2012;14 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</context>
</context-group>
- <target>Copyright &#169; 2002&#x2012;13 Red Hat, Inc. Todos los derechos reservados.</target>
+ <target>Copyright &#169; 2002&#x2012;14 Red Hat, Inc. Todos los derechos reservados.</target>
</trans-unit>
<trans-unit id="footer.jsp.legalStatement">
<source>Legal statement</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
index acd0eec..631e71b 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
@@ -1354,11 +1354,11 @@
</trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
- <source>Copyright &#169; 2002&#x2012;13 Red Hat, Inc. All rights reserved.</source>
+ <source>Copyright &#169; 2002&#x2012;14 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</context>
</context-group>
- <target>Copyright &#169; 2002&#x2012;13 Red Hat, Inc. Tous droits réservés.</target>
+ <target>Copyright &#169; 2002&#x2012;14 Red Hat, Inc. Tous droits réservés.</target>
</trans-unit>
<trans-unit id="footer.jsp.legalStatement">
<source>Legal statement</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
index 2b94d70..7fc60a9 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
@@ -1272,11 +1272,11 @@
</trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
- <source>Copyright &#169; 2002&#x2012;13 Red Hat, Inc. All rights reserved.</source>
+ <source>Copyright &#169; 2002&#x2012;14 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</context>
</context-group>
- <target>Copyright &#169; 2002&#x2012;13 Red Hat, Inc. All rights reserved.</target>
+ <target>Copyright &#169; 2002&#x2012;14 Red Hat, Inc. All rights reserved.</target>
</trans-unit>
<trans-unit id="footer.jsp.legalStatement">
<source>Legal statement</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
index 3386f1a..aa7b874 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
@@ -1272,11 +1272,11 @@
</trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
- <source>Copyright &#169; 2002&#x2012;13 Red Hat, Inc. All rights reserved.</source>
+ <source>Copyright &#169; 2002&#x2012;14 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</context>
</context-group>
- <target>कॉपीराइट &#169; 2002&#x2012;13 Red Hat, Inc. सर्वाधिकार सुरक्षित.</target>
+ <target>कॉपीराइट &#169; 2002&#x2012;14 Red Hat, Inc. सर्वाधिकार सुरक्षित.</target>
</trans-unit>
<trans-unit id="footer.jsp.legalStatement">
<source>Legal statement</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
index 6ef9427..d527162 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
@@ -1354,11 +1354,11 @@
</trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
- <source>Copyright &#169; 2002&#x2012;13 Red Hat, Inc. All rights reserved.</source>
+ <source>Copyright &#169; 2002&#x2012;14 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</context>
</context-group>
- <target>Copyright &#169; 2002&#x2012;13 Red Hat, Inc. Tutti i diritti riservati.</target>
+ <target>Copyright &#169; 2002&#x2012;14 Red Hat, Inc. Tutti i diritti riservati.</target>
</trans-unit>
<trans-unit id="footer.jsp.legalStatement">
<source>Legal statement</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
index b33f579..1e3e9f0 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
@@ -1355,11 +1355,11 @@ Satellite の 組織管理者でないとユーザーを削除できません。
</trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
- <source>Copyright &#169; 2002&#x2012;13 Red Hat, Inc. All rights reserved.</source>
+ <source>Copyright &#169; 2002&#x2012;14 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</context>
</context-group>
- <target>Copyright &#169; 2002&#x2012;13 Red Hat, Inc. All rights reserved.</target>
+ <target>Copyright &#169; 2002&#x2012;14 Red Hat, Inc. All rights reserved.</target>
</trans-unit>
<trans-unit id="footer.jsp.legalStatement">
<source>Legal statement</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
index a506314..ee1eaef 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
@@ -1354,11 +1354,11 @@
</trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
- <source>Copyright &#169; 2002&#x2012;13 Red Hat, Inc. All rights reserved.</source>
+ <source>Copyright &#169; 2002&#x2012;14 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</context>
</context-group>
- <target>Copyright &#169; 2002&#x2012;13 Red Hat, Inc. All rights reserved.</target>
+ <target>Copyright &#169; 2002&#x2012;14 Red Hat, Inc. All rights reserved.</target>
</trans-unit>
<trans-unit id="footer.jsp.legalStatement">
<source>Legal statement</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
index b5cf842..60dd4e6 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
@@ -1272,11 +1272,11 @@
</trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
- <source>Copyright &#169; 2002&#x2012;13 Red Hat, Inc. All rights reserved.</source>
+ <source>Copyright &#169; 2002&#x2012;14 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</context>
</context-group>
- <target>ਕਾਪੀਰਾਈਟ &#169; 2002&#x2012;13 Red Hat, Inc. ਸਭ ਹੱਕ ਰਾਖਵੇਂ ਹਨ।</target>
+ <target>ਕਾਪੀਰਾਈਟ &#169; 2002&#x2012;14 Red Hat, Inc. ਸਭ ਹੱਕ ਰਾਖਵੇਂ ਹਨ।</target>
</trans-unit>
<trans-unit id="footer.jsp.legalStatement">
<source>Legal statement</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
index 369e88b..8737d43 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
@@ -1354,11 +1354,11 @@
</trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
- <source>Copyright &#169; 2002&#x2012;13 Red Hat, Inc. All rights reserved.</source>
+ <source>Copyright &#169; 2002&#x2012;14 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</context>
</context-group>
- <target>Copyright &#169; 2002&#x2012;13 Red Hat, Inc. All rights reserved.</target>
+ <target>Copyright &#169; 2002&#x2012;14 Red Hat, Inc. All rights reserved.</target>
</trans-unit>
<trans-unit id="footer.jsp.legalStatement">
<source>Legal statement</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
index b8d4578..1dedf1d 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
@@ -1354,11 +1354,11 @@
</trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
- <source>Copyright &#169; 2002&#x2012;13 Red Hat, Inc. All rights reserved.</source>
+ <source>Copyright &#169; 2002&#x2012;14 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</context>
</context-group>
- <target>&#169; 2002&#x2012;13 Red Hat, Inc. Все права защищены.</target>
+ <target>&#169; 2002&#x2012;14 Red Hat, Inc. Все права защищены.</target>
</trans-unit>
<trans-unit id="footer.jsp.legalStatement">
<source>Legal statement</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
index a4795d5..55fa52d 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
@@ -1272,11 +1272,11 @@
</trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
- <source>Copyright &#169; 2002&#x2012;13 Red Hat, Inc. All rights reserved.</source>
+ <source>Copyright &#169; 2002&#x2012;14 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</context>
</context-group>
- <target>பதிப்புரிமை &#169; 2002&#x2012;13 Red Hat, Inc. அனைத்து உரிமைகளும் உள்ளடக்கியது.</target>
+ <target>பதிப்புரிமை &#169; 2002&#x2012;14 Red Hat, Inc. அனைத்து உரிமைகளும் உள்ளடக்கியது.</target>
</trans-unit>
<trans-unit id="footer.jsp.legalStatement">
<source>Legal statement</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
index bd71e62..b930b6d 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
@@ -1354,11 +1354,11 @@
</trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
- <source>Copyright &#169; 2002&#x2012;13 Red Hat, Inc. All rights reserved.</source>
+ <source>Copyright &#169; 2002&#x2012;14 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</context>
</context-group>
- <target>版权 &#169; 2002&#x2012;13 红帽公司版权所有。</target>
+ <target>版权 &#169; 2002&#x2012;14 红帽公司版权所有。</target>
</trans-unit>
<trans-unit id="footer.jsp.legalStatement">
<source>Legal statement</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
index fc7b64d..af0be3a 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
@@ -1354,11 +1354,11 @@
</trans-unit>
<!-- footer.jsp -->
<trans-unit id="footer.jsp.copyright">
- <source>Copyright &#169; 2002&#x2012;13 Red Hat, Inc. All rights reserved.</source>
+ <source>Copyright &#169; 2002&#x2012;14 Red Hat, Inc. All rights reserved.</source>
<context-group name="ctx">
<context context-type="sourcefile">./includes/footer.jsp</context>
</context-group>
- <target>版權所有 &#169; 2002&#x2012;13 Red Hat, Inc. 保留所有權利。</target>
+ <target>版權所有 &#169; 2002&#x2012;14 Red Hat, Inc. 保留所有權利。</target>
</trans-unit>
<trans-unit id="footer.jsp.legalStatement">
<source>Legal statement</source>
8 years, 5 months
java/code
by mkollar
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf | 43 +++-------
1 file changed, 17 insertions(+), 26 deletions(-)
New commits:
commit c250967cff752b0a26261bce76df14ee1deffc2c
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Jan 30 07:50:09 2014 +0100
Removing unaesthetic spaces around dots in IPv4 address
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf
index a82ba54..c8cd917 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/ipranges.jspf
@@ -54,7 +54,7 @@
</div>
</div>
</c:forEach>
-
+
<rhn:csrf />
<div class="form-group">
<div class="row">
@@ -62,30 +62,21 @@
<bean:message key="kickstartips.jsp.label" />:
</label>
<fieldset class="col-md-8">
-
- <html:text styleClass="input-ip-range" property="octet1a" maxlength="3" size="3" />
- <span class="dot-ip-range">.</span>
-
- <html:text styleClass="input-ip-range" property="octet1b" maxlength="3" size="3" />
- <span class="dot-ip-range">.</span>
-
- <html:text styleClass="input-ip-range" property="octet1c" maxlength="3" size="3" />
- <span class="dot-ip-range">.</span>
-
- <html:text styleClass="input-ip-range" property="octet1d" maxlength="3" size="3" />
- <span class="dash-ip-range"> - </span>
-
- <html:text styleClass="input-ip-range" property="octet2a" maxlength="3" size="3" />
- <span class="dot-ip-range">.</span>
-
- <html:text styleClass="input-ip-range" property="octet2b" maxlength="3" size="3" />
- <span class="dot-ip-range">.</span>
-
- <html:text styleClass="input-ip-range" property="octet2c" maxlength="3" size="3" />
- <span class="dot-ip-range">.</span>
-
- <html:text styleClass="input-ip-range" property="octet2d" maxlength="3" size="3" />
-
+ <html:text styleClass="input-ip-range" property="octet1a" maxlength="3" size="3"
+ /><span class="dot-ip-range">.</span
+ ><html:text styleClass="input-ip-range" property="octet1b" maxlength="3" size="3"
+ /><span class="dot-ip-range">.</span
+ ><html:text styleClass="input-ip-range" property="octet1c" maxlength="3" size="3"
+ /><span class="dot-ip-range">.</span
+ ><html:text styleClass="input-ip-range" property="octet1d" maxlength="3" size="3"
+ /><span class="dash-ip-range"> - </span
+ ><html:text styleClass="input-ip-range" property="octet2a" maxlength="3" size="3"
+ /><span class="dot-ip-range">.</span
+ ><html:text styleClass="input-ip-range" property="octet2b" maxlength="3" size="3"
+ /><span class="dot-ip-range">.</span
+ ><html:text styleClass="input-ip-range" property="octet2c" maxlength="3" size="3"
+ /><span class="dot-ip-range">.</span
+ ><html:text styleClass="input-ip-range" property="octet2d" maxlength="3" size="3" />
</fieldset>
</div>
</div>
@@ -102,4 +93,4 @@
</html:form>
</div>
-</div>
\ No newline at end of file
+</div>
8 years, 5 months
java/code
by mkollar
java/code/src/com/redhat/rhn/frontend/action/groups/BaseListAction.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
New commits:
commit 9d2c3f347a9f6e1daa6653d9668ae754431d6387
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Jan 30 07:42:09 2014 +0100
Small code cleanup
diff --git a/java/code/src/com/redhat/rhn/frontend/action/groups/BaseListAction.java b/java/code/src/com/redhat/rhn/frontend/action/groups/BaseListAction.java
index 1a9493d..8684a73 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/groups/BaseListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/groups/BaseListAction.java
@@ -62,6 +62,7 @@ public abstract class BaseListAction extends RhnAction implements Listable {
}
/** {@inheritDoc} */
+ @Override
public ActionForward execute(ActionMapping mapping,
ActionForm formIn,
HttpServletRequest request,
@@ -80,14 +81,11 @@ public abstract class BaseListAction extends RhnAction implements Listable {
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
- protected ActionForward handleDispatch(
+ protected abstract ActionForward handleDispatch(
ListSessionSetHelper helper,
ActionMapping mapping,
ActionForm formIn, HttpServletRequest request,
- HttpServletResponse response) {
-
- return null;
- }
+ HttpServletResponse response);
protected void processHelper(ListSessionSetHelper helper) {
helper.setDataSetName(getDataSetName());
8 years, 5 months
Changes to 'refs/tags/spacewalk-java-2.1.136-1'
by mkollar
Tag 'spacewalk-java-2.1.136-1' created by Matej Kollar <mkollar(a)redhat.com> at 2014-01-30 06:11 +0000
Tagging package [spacewalk-java] version [2.1.136-1] in directory [java/].
Changes since spacewalk-backend-2.1.46-1:
Matej Kollar (3):
Sometimes we don't want "add to ssm" option...
Fixed ssm reboot scheduling.
Automatic commit of package [spacewalk-java] release [2.1.136-1].
Michael Mraka (1):
fixed typo
---
backend/satellite_tools/spacewalk-remove-channel | 4
java/code/src/com/redhat/rhn/frontend/action/ssm/RebootSystemAction.java | 135 +++-------
java/code/src/com/redhat/rhn/frontend/action/ssm/RebootSystemConfirmAction.java | 115 ++++++++
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 13
java/code/webapp/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf | 4
java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system-confirm.jsp | 34 ++
java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system.jsp | 27 --
java/code/webapp/WEB-INF/struts-config.xml | 33 ++
java/spacewalk-java.spec | 12
rel-eng/packages/spacewalk-java | 2
10 files changed, 256 insertions(+), 123 deletions(-)
---
8 years, 5 months
java/spacewalk-java.spec rel-eng/packages
by mkollar
java/spacewalk-java.spec | 12 +++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 13bbe68fa8e90d1eb4506ee38e4e73b5fbc62885
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Jan 30 07:11:10 2014 +0100
Automatic commit of package [spacewalk-java] release [2.1.136-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index b6f3906..48d4757 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.135
+Version: 2.1.136
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -801,6 +801,16 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Jan 30 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.136-1
+- Fixed ssm reboot scheduling.
+- Sometimes we don't want "add to ssm" option...
+- add message about system lock/unlock into ssm index
+- use icon for locked system
+- 1009396 - escape system name for ssm lock/unlock page
+- add defaultsort for extra packages page
+- add defaultSort for packages list/remove
+- add defaultSort to package list
+
* Tue Jan 28 2014 Stephen Herr <sherr(a)redhat.com> 2.1.135-1
- 1058761 - Update RHEL 7 VM memory requirements to 1024 MB
- rendering the password strength meter
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index a8d0866..1c41b95 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.135-1 java/
+2.1.136-1 java/
8 years, 5 months
2 commits - java/code
by mkollar
java/code/src/com/redhat/rhn/frontend/action/ssm/RebootSystemAction.java | 135 +++-------
java/code/src/com/redhat/rhn/frontend/action/ssm/RebootSystemConfirmAction.java | 115 ++++++++
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 13
java/code/webapp/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf | 4
java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system-confirm.jsp | 34 ++
java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system.jsp | 27 --
java/code/webapp/WEB-INF/struts-config.xml | 33 ++
7 files changed, 242 insertions(+), 119 deletions(-)
New commits:
commit eea3c6320bfc3dae8532844a7c0e71dcc5712c39
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Jan 30 07:04:49 2014 +0100
Fixed ssm reboot scheduling.
Recent rewrite to Java missed several things that are now fied:
* Added some localization strings (instead of reuse of unrelated
* ones).
* Addec confirmation page.
* Fixed scheduling so date in the future can be used.
* Minor style usability issues.
Additionally code was simplified, mostly due to
split to two pages and usage of ListSessionSetHelper.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/ssm/RebootSystemAction.java b/java/code/src/com/redhat/rhn/frontend/action/ssm/RebootSystemAction.java
index c8f81c7..31b1722 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/ssm/RebootSystemAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/ssm/RebootSystemAction.java
@@ -15,33 +15,25 @@
package com.redhat.rhn.frontend.action.ssm;
-import com.redhat.rhn.common.db.datasource.DataResult;
-import com.redhat.rhn.common.messaging.MessageQueue;
-import com.redhat.rhn.common.util.DatePicker;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
import com.redhat.rhn.domain.rhnset.RhnSet;
import com.redhat.rhn.frontend.dto.SystemOverview;
-import com.redhat.rhn.frontend.events.SsmSystemRebootEvent;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
-import com.redhat.rhn.frontend.struts.RhnListSetHelper;
-import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
-import com.redhat.rhn.frontend.taglibs.list.TagHelper;
+import com.redhat.rhn.frontend.taglibs.list.helper.ListSessionSetHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
+import com.redhat.rhn.manager.rhnset.RhnSetManager;
import com.redhat.rhn.manager.system.SystemManager;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
-import org.apache.struts.action.DynaActionForm;
/**
@@ -53,95 +45,54 @@ public class RebootSystemAction
extends RhnListAction
implements Listable {
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public ActionForward execute(ActionMapping mapping,
- ActionForm actionForm,
- HttpServletRequest request,
- HttpServletResponse response) {
- RequestContext context = new RequestContext(request);
- List result = this.getResult(context);
- DynaActionForm form = (DynaActionForm) actionForm;
- RhnSet set = RhnSetDecl.SSM_SYSTEMS_REBOOT.get(context.getCurrentUser());
- RhnListSetHelper helper = new RhnListSetHelper(request);
- String forwardPageId = RhnHelper.DEFAULT_FORWARD;
- ActionMessages actionMessages = new ActionMessages();
- ActionErrors actionErrors = new ActionErrors();
-
- if (ListTagHelper.getListAction("systemList", request) != null) {
- helper.execute(set, "systemList", result);
+ ActionForm formIn,
+ HttpServletRequest request,
+ HttpServletResponse response) {
+
+ ListSessionSetHelper helper = new ListSessionSetHelper(this, request);
+ helper.setDataSetName(RequestContext.PAGE_LIST);
+ helper.setListName("systemList");
+ helper.execute();
+
+ if (helper.isDispatched()) {
+ ActionForward forward =
+ handleDispatch(helper, mapping, request);
+ return forward;
}
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
+ }
- if (!set.isEmpty()) {
- helper.syncSelections(set, result);
- ListTagHelper.setSelectedAmount("systemList", set.size(), request);
- }
-
- request.setAttribute(RequestContext.PAGE_LIST, result);
- ListTagHelper.bindSetDeclTo("systemList",
- RhnSetDecl.SSM_SYSTEMS_REBOOT,
- request);
- request.setAttribute(RequestContext.PAGE_LIST, result);
- request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
- TagHelper.bindElaboratorTo("systemList",
- ((DataResult) result).getElaborator(),
- request);
-
- if ((request.getParameter("dispatch") != null) &&
- (context.wasDispatched("installconfirm.jsp.confirm"))) {
- List<Long> serverIdsToReboot = new ArrayList<Long>();
- Iterator<Long> sysIds = set.getElementValues().iterator();
- while (sysIds.hasNext()) {
- serverIdsToReboot.add(sysIds.next());
- }
-
- if (!serverIdsToReboot.isEmpty()) {
- // Make an event
- MessageQueue.publish(new SsmSystemRebootEvent(
- context.getLoggedInUser().getId(),
- this.getStrutsDelegate().readDatePicker(form,
- "date",
- DatePicker.YEAR_RANGE_POSITIVE),
- serverIdsToReboot));
- actionMessages.add(
- ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("ssm.misc.reboot.message.success.default"));
+ private ActionForward handleDispatch(
+ ListSessionSetHelper helper,
+ ActionMapping mapping,
+ HttpServletRequest request) {
- // Clear the selection from the form
- set.clear();
- RhnSetDecl.SSM_SYSTEMS_REBOOT.clear(context.getLoggedInUser());
+ RequestContext context = new RequestContext(request);
+ RhnSet set = RhnSetDecl.SSM_SYSTEMS_REBOOT.get(context.getCurrentUser());
- forwardPageId = "confirm";
- }
- else {
- actionErrors.add(
- ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("ssm.misc.reboot.message.error.noselect"));
- }
+ set.clear();
+ for (String item : helper.getSet()) {
+ set.addElement(item);
}
-
- request.setAttribute("date", this.getStrutsDelegate().prepopulateDatePicker(
- request, form, "date", DatePicker.YEAR_RANGE_POSITIVE));
-
- this.getStrutsDelegate().saveMessages(request, actionMessages);
- this.getStrutsDelegate().saveMessages(request, actionErrors);
-
- return mapping.findForward(forwardPageId);
+ RhnSetManager.store(set);
+ return mapping.findForward("confirm");
}
-
/**
* Get the dataset result.
*
* @param context Request context.
* @return List of SystemOverview objects.
*/
+ @SuppressWarnings("rawtypes")
public List getResult(RequestContext context) {
List<SystemOverview> systems = SystemManager.inSet(context.getCurrentUser(),
- RhnSetDecl.SYSTEMS.getLabel());
- for (Iterator<SystemOverview> itr = systems.iterator(); itr.hasNext();) {
- itr.next().setSelectable(1);
+ RhnSetDecl.SYSTEMS.getLabel());
+ for (SystemOverview systemOverview : systems) {
+ systemOverview.setSelectable(1);
}
return systems;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/ssm/RebootSystemConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/ssm/RebootSystemConfirmAction.java
new file mode 100644
index 0000000..141f74d
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/action/ssm/RebootSystemConfirmAction.java
@@ -0,0 +1,115 @@
+/**
+ * Copyright (c) 2014 Red Hat, Inc.
+ *
+ * This software is licensed to you under the GNU General Public License,
+ * version 2 (GPLv2). There is NO WARRANTY for this software, express or
+ * implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+ * along with this software; if not, see
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * Red Hat trademarks are not licensed under GPLv2. No permission is
+ * granted to use or replicate Red Hat trademarks that are incorporated
+ * in this software or its documentation.
+ */
+package com.redhat.rhn.frontend.action.ssm;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.DynaActionForm;
+
+import com.redhat.rhn.common.localization.LocalizationService;
+import com.redhat.rhn.common.messaging.MessageQueue;
+import com.redhat.rhn.common.util.DatePicker;
+import com.redhat.rhn.domain.rhnset.RhnSet;
+import com.redhat.rhn.frontend.events.SsmSystemRebootEvent;
+import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
+import com.redhat.rhn.frontend.taglibs.list.helper.ListRhnSetHelper;
+import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
+import com.redhat.rhn.manager.rhnset.RhnSetDecl;
+import com.redhat.rhn.manager.rhnset.RhnSetManager;
+import com.redhat.rhn.manager.system.SystemManager;
+
+/**
+ * Confirm reboot of given systems
+ */
+public class RebootSystemConfirmAction extends RhnAction implements Listable {
+
+ /** {@inheritDoc} */
+ @Override
+ public ActionForward execute(ActionMapping mapping,
+ ActionForm formIn,
+ HttpServletRequest request,
+ HttpServletResponse response) {
+
+
+ ListRhnSetHelper helper = new ListRhnSetHelper(this, request, getSetDecl());
+ helper.setWillClearSet(false);
+ helper.setDataSetName(RequestContext.PAGE_LIST);
+ helper.setListName("systemList");
+ helper.execute();
+ if (helper.isDispatched()) {
+ return handleDispatch(mapping, (DynaActionForm) formIn, request);
+ }
+
+ getStrutsDelegate().prepopulateDatePicker(request,
+ (DynaActionForm) formIn, "date", DatePicker.YEAR_RANGE_POSITIVE);
+
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
+ }
+
+ /** {@inheritDoc} */
+ protected RhnSetDecl getSetDecl() {
+ return RhnSetDecl.SSM_SYSTEMS_REBOOT;
+ }
+
+ private ActionForward handleDispatch(
+ ActionMapping mapping,
+ DynaActionForm formIn,
+ HttpServletRequest request) {
+
+ RequestContext context = new RequestContext(request);
+ RhnSet set = getSetDecl().get(context.getCurrentUser());
+ List<Long> systemsToReboot = new ArrayList<Long>();
+ systemsToReboot.addAll(set.getElementValues());
+
+ Date earliest = getStrutsDelegate().readDatePicker(formIn,
+ "date", DatePicker.YEAR_RANGE_POSITIVE);
+
+ MessageQueue.publish(new SsmSystemRebootEvent(
+ context.getLoggedInUser().getId(),
+ earliest, systemsToReboot));
+
+ int n = set.size();
+ if (n == 1) {
+ createSuccessMessage(request, "ssm.misc.reboot.message.success.singular",
+ LocalizationService.getInstance().formatNumber(new Integer(n)));
+ }
+ else {
+ createSuccessMessage(request, "ssm.misc.reboot.message.success.plural",
+ LocalizationService.getInstance().formatNumber(new Integer(n)));
+ }
+
+ set.clear();
+ RhnSetManager.store(set);
+
+ return mapping.findForward("confirm");
+ }
+
+ /** {@inheritDoc} */
+ @SuppressWarnings("rawtypes")
+ public List getResult(RequestContext context) {
+ return SystemManager.inSet(context.getCurrentUser(),
+ getSetDecl().getLabel());
+ }
+}
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 21618c6..ba6a15c 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
@@ -4658,12 +4658,21 @@ value for this entitlement, excluding the default organization's consumption.</s
<trans-unit id="ssm.misc.reboot.operationname">
<source>Schedule Systems Reboot</source>
</trans-unit>
- <trans-unit id="ssm.misc.reboot.message.success.default">
- <source>Systems reboot has been scheduled.</source>
+ <trans-unit id="ssm.misc.reboot.message.success.singular">
+ <source>{0} system reboot has been scheduled.</source>
+ </trans-unit>
+ <trans-unit id="ssm.misc.reboot.message.success.plural">
+ <source>{0} systems reboot has been scheduled.</source>
</trans-unit>
<trans-unit id="ssm.misc.reboot.message.error.noselect">
<source>Please select at least one system for reboot.</source>
</trans-unit>
+ <trans-unit id="ssm.misc.reboot.no-system">
+ <source>There are no selected systems.</source>
+ </trans-unit>
+ <trans-unit id="ssm.misc.reboot.confirm">
+ <source>Confirm</source>
+ </trans-unit>
<trans-unit id="ssm.misc.lockunlock.tabtitle">
<source>Lock/Unlock</source>
</trans-unit>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system-confirm.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system-confirm.jsp
new file mode 100644
index 0000000..95d1b38
--- /dev/null
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system-confirm.jsp
@@ -0,0 +1,34 @@
+<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
+<%@taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
+<%@taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+
+<html>
+<body>
+<%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %>
+
+following systems will get rebooted...
+<rl:listset name="systemListSet">
+ <c:set var="notSelectable" value="True"/>
+ <c:set var="noCsv" value="1" />
+ <c:set var="noAddToSsm" value="1" />
+ <%@ include file="/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf" %>
+ <hr />
+
+ <div style="text-align: center">
+ <bean:message key="scheduleremote.jsp.nosoonerthan" />
+ <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
+ <jsp:param name="widget" value="date" />
+ </jsp:include>
+ </div>
+ <rhn:submitted />
+ <div class="text-right">
+ <html:submit property="dispatch">
+ <bean:message key="ssm.misc.reboot.confirm" />
+ </html:submit>
+ </div>
+
+</rl:listset>
+</body>
+</html>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system.jsp
index b74ff4e..243c74a 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/reboot-system.jsp
@@ -3,7 +3,6 @@
Created on : Jul 16, 2013, 2:35:54 PM
Author : Bo Maryniuk <bo(a)suse.de>
--%>
-
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
@@ -12,10 +11,6 @@
<%@taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd">
-
-
<html>
<body>
<%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %>
@@ -23,24 +18,14 @@
<p><bean:message key="ssm.misc.reboot.summary" /></p>
<rl:listset name="systemsListSet" legend="system">
- <c:set var="noCsv" value="1"/>
+ <c:set var="noCsv" value="1" />
+ <c:set var="noAddToSsm" value="1" />
<%@ include file="/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf" %>
+ <hr />
<div class="text-right">
- <div align="left">
- <p><bean:message key="installconfirm.jsp.widgetsummary"/></p>
- <table class="details" align="center">
- <tr>
- <th><label for="radio_use_date_than"><bean:message key="confirm.jsp.than"/></label></th>
- <td>
- <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp">
- <jsp:param name="widget" value="date"/>
- </jsp:include>
- </td>
- </tr>
- </table>
- </div>
- <hr/>
- <input type="submit" name="dispatch" value='<bean:message key="installconfirm.jsp.confirm"/>'/>
+ <html:submit property="dispatch">
+ <bean:message key="ssm.misc.reboot.operationname" />
+ </html:submit>
</div>
</rl:listset>
</body>
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index f7d358c..99e9d59 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -1132,6 +1132,17 @@
<form-property name="submitted" type="java.lang.Boolean"/>
</form-bean>
+ <form-bean name="ssmRebootForm"
+ type="com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm" >
+ <form-property name="submitted" type="java.lang.Boolean"/>
+ <form-property name="date_year" type="java.lang.Integer"/>
+ <form-property name="date_month" type="java.lang.Integer"/>
+ <form-property name="date_day" type="java.lang.Integer"/>
+ <form-property name="date_hour" type="java.lang.Integer"/>
+ <form-property name="date_minute" type="java.lang.Integer"/>
+ <form-property name="date_am_pm" type="java.lang.Integer"/>
+ </form-bean>
+
<form-bean name="ssmMigrateForm"
type="com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm" >
<form-property name="org" type="java.lang.String"/>
@@ -5257,12 +5268,28 @@
scope="request"
input="/WEB-INF/pages/ssm/systems/misc/reboot-system.jsp"
type="com.redhat.rhn.frontend.action.ssm.RebootSystemAction"
- name="ssmPreferencesForm"
+ name="ssmRebootForm"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
- <forward name="confirm"
- path="/WEB-INF/pages/ssm/systems/misc/index.jsp" />
+ <set-property property="postRequiredIfSubmitted" value="true" />
<forward name="default"
path="/WEB-INF/pages/ssm/systems/misc/reboot-system.jsp" />
+ <forward name="confirm"
+ path="/systems/ssm/misc/RebootSystemConfirm.do"
+ redirect="true" />
+ </action>
+
+ <action path="/systems/ssm/misc/RebootSystemConfirm"
+ scope="request"
+ input="/WEB-INF/pages/ssm/systems/misc/reboot-system-confirm.jsp"
+ type="com.redhat.rhn.frontend.action.ssm.RebootSystemConfirmAction"
+ name="ssmRebootForm"
+ className="com.redhat.rhn.frontend.struts.RhnActionMapping">
+ <set-property property="postRequiredIfSubmitted" value="true" />
+ <forward name="default"
+ path="/WEB-INF/pages/ssm/systems/misc/reboot-system-confirm.jsp" />
+ <forward name="confirm"
+ path="/systems/ssm/misc/RebootSystem.do"
+ redirect="true" />
</action>
<action path="/systems/ssm/misc/Index"
commit 4b79a4145751a85b90715ae6a01e677ae301aa5b
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Thu Jan 30 07:03:27 2014 +0100
Sometimes we don't want "add to ssm" option...
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf
index 8c6907b..e9c8ff8 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf
@@ -23,7 +23,9 @@
<rl:decorator name="ElaborationDecorator"/>
<rl:decorator name="SystemIconDecorator"/>
<rl:decorator name="PageSizeDecorator"/>
- <rl:decorator name="AddToSsmDecorator" />
+ <c:if test = "${empty noAddToSsm}">
+ <rl:decorator name="AddToSsmDecorator" />
+ </c:if>
<c:if test = "${empty notSelectable}">
<rl:decorator name="SelectableDecorator"/>
8 years, 5 months
Changes to 'master-action-chaining'
by Silvio Moioli
New branch 'master-action-chaining' available with the following commits:
commit 00ec4d3e1849f30430594a827621433cecb246a9
Author: Bo Maryniuk <bo(a)suse.de>
Date: Fri Jan 24 19:40:47 2014 +0100
Squashme: ActionChain API
commit 4dc3487a83465a7e5270346c8612ac124246414a
Author: Bo Maryniuk <bo(a)suse.de>
Date: Thu Jan 23 20:22:32 2014 +0100
TBD: Added ActionChainHandler
commit 4e46a3ad0ab82dfdfae5b7671a81e632713b14ac
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Tue Jan 28 11:23:54 2014 +0100
Action Chain Edit page: tests
commit 48abcaa53502b3ab842095363e2270c2fae9159e
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 29 16:51:44 2014 +0100
Action Chain Edit page: sort groups
commit cd49baa6fd73190627bfbc7d6b4b8e4696a0bdbe
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 29 08:58:08 2014 +0100
Action Chain Edit page: delete groups
commit 060b095929f938892bcab19e109068d62e9e0dee
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Tue Jan 28 11:23:37 2014 +0100
Action Chain Edit page: add editable label
commit d86721620d41cf1967fb2a031ca9bf54a9648453
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 27 17:16:03 2014 +0100
Action Chain Edit page: add delete chain button
commit 08aba05e3a2ede7ab1383f6e476ddce8861efdeb
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 27 15:18:24 2014 +0100
Action Chain Edit page added
Browsing only at the moment, editing will be added later
commit 10bc1adda4f0854456a6d34c525b152220d6dbf6
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 22 16:44:48 2014 +0100
Action Chain List page added
commit aa06e185c9445e979c4cd2577e6c75a4c210f8ca
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 20 18:21:11 2014 +0100
Reboot: use proper user messages
commit 7b929f9f14dad1340e46e6a18bc98b3db7393b1d
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 20 18:18:15 2014 +0100
Reboot: allow queuing to Action Chains
commit d072139b4059c094aa7d8b94fd1349ecffb2506f
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 20 18:00:37 2014 +0100
Deploy Configuration: use proper user message
commit e1f3ecfe795f63397392ec9b4360be89e2477eea
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 20 17:42:37 2014 +0100
Deploy Configuration: allow queuing to Action Chains
commit 5f7fb1645ccfdb713503ea5d65ac22d39d5aa052
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Jan 17 14:36:34 2014 +0100
Remote Command: use proper user message
commit 2b105016aaa8d0680ad0179fcc3e4bf92c397df4
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Jan 17 14:32:05 2014 +0100
Remote Command: allow queuing to Action Chains
commit 273228d5de0c8162dfba114784329bd4bb9f0643
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Jan 17 12:53:37 2014 +0100
Errata actions: use proper user message
commit d8f4ad699d68425eceff9838713a15a5863a83bf
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Jan 17 12:27:50 2014 +0100
Errata actions: allow queuing to Action Chains
commit 7553dbe83b5ccde1aa264bfb827afa5abee594a9
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Jan 16 12:17:04 2014 +0100
Remove functionality to add remote command before a package action, it is superseded by Action Chains
commit f8de09c47d01d449ebc2a36c724a301a9945dd6e
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Jan 16 13:44:54 2014 +0100
Single system package actions: use proper user message
commit a3613b43042bf26f2485f0f27c5581f93c44c2b1
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Jan 16 09:23:45 2014 +0100
Single system package actions: allow queuing to Action Chains
commit 892384938a5c77651fbbf3893df7f563baa7e117
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 15 15:26:50 2014 +0100
Controller helper tests added
commit ee285c958546ce801a746301669554ea44515787
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 15 15:26:38 2014 +0100
Controller helper class added
commit f41ae8212a4b5ae61ade236d5524908469eb3f38
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Tue Jan 14 16:17:48 2014 +0100
ORM class tests added
commit ab44b0b96f6a73e4cbfc2b89ebed40bc0d326858
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Tue Jan 14 16:17:23 2014 +0100
ORM classes for new tables added
commit 98d6b53c5d4f63abaf7588654d2bb3b5b94ab217
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 13 12:23:52 2014 +0100
New tables and upgrade scripts added
commit 59227fc8c571682708116cbc59fa5ba7819b13f9
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 22 13:37:27 2014 +0100
Front-end code for action chain creation/selection added
commit a2a73fa94cff8a43b574c5d2b4060651f471d1f8
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 22 14:48:17 2014 +0100
Javascript library jQuery UI added
commit 32bc4fe75ccdff87f1dce314d31b8e1507bdf897
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 22 13:37:55 2014 +0100
Javascript library select2 added
commit 5ab9fbce1b6ed00d35c6a91707ce594b76983463
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 27 10:54:01 2014 +0100
ActionFormatter: utility methods tests
commit 3e08b76e25c85c709be6d5324782b88024e67962
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 27 09:10:19 2014 +0100
ActionFormatter: add utility methods
commit 60b29d5854da6a7603dea0a38d752ab592c8618b
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 8 18:34:43 2014 +0100
Refactoring: use a fragment for scheduling options on supported operations
8 years, 5 months
backend/satellite_tools
by Michael Mraka
backend/satellite_tools/spacewalk-remove-channel | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 914e1a37930c12f7b1492318cd0a2cfb66267401
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 29 16:15:04 2014 +0100
fixed typo
diff --git a/backend/satellite_tools/spacewalk-remove-channel b/backend/satellite_tools/spacewalk-remove-channel
index 13e005a..5e0a1c8 100755
--- a/backend/satellite_tools/spacewalk-remove-channel
+++ b/backend/satellite_tools/spacewalk-remove-channel
@@ -546,7 +546,7 @@ def _get_package_paths(package_ids, sources=0):
return pdict.keys()
-def _delete_ks_files(channel_lables):
+def _delete_ks_files(channel_labels):
sql = """
select kt.base_path
from rhnChannel c
@@ -554,7 +554,7 @@ def _delete_ks_files(channel_lables):
where c.label in (%s);
"""
- params, bind_params = _bind_many(channel_lables)
+ params, bind_params = _bind_many(channel_labels)
bind_params = string.join(bind_params, ', ')
h = rhnSQL.prepare(sql % (bind_params))
h.execute(**params)
8 years, 5 months