2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by StephenHerr
java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java | 11 ++++-
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 20 ++++++++++
java/code/src/com/redhat/rhn/domain/kickstart/KickstartInstallType.java | 11 ++++-
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java | 17 ++++++--
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 3 +
java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SelectableDecorator.java | 3 +
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCreateCommand.java | 2 -
java/spacewalk-java.spec | 5 ++
rel-eng/packages/spacewalk-java | 2 -
9 files changed, 61 insertions(+), 13 deletions(-)
New commits:
commit 17c838a719c056e0961bc62d9bfc11e64defad32
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Dec 10 16:47:55 2013 -0500
Automatic commit of package [spacewalk-java] release [2.1.93-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 943b818..0dadece 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.92
+Version: 2.1.93
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -785,6 +785,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Dec 10 2013 Stephen Herr <sherr(a)redhat.com> 2.1.93-1
+- 1039193 - Increase default ram to 768 for RHEL 7
+
* Tue Dec 10 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.92-1
- bootstrap tuning: use new icon tag
- use static code for icons map in IconTag + typo and documentation fix
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index d93ca7f..8fe0e22 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.92-1 java/
+2.1.93-1 java/
commit 009fab04141c565843e871bc705604f6a15465d2
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Dec 10 16:47:43 2013 -0500
1039193 - Increase default ram to 768 for RHEL 7
diff --git a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
index 5cd5579..46a3aa3 100644
--- a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
+++ b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java
@@ -16,6 +16,8 @@ package com.redhat.rhn.common.conf;
import org.apache.commons.lang.StringUtils;
+import com.redhat.rhn.domain.kickstart.KickstartData;
+
import java.io.File;
/**
@@ -358,10 +360,15 @@ public class ConfigDefaults {
}
/**
- * Returns the defualt VirtMemory Size in MBs
+ * Returns the default VirtMemory Size in MBs
+ * @param data the kickstart data, so we can tell if it's RHEL 7
* @return the memory size
*/
- public int getDefaultVirtMemorySize() {
+ public int getDefaultVirtMemorySize(KickstartData data) {
+ // RHEL 7 requires at least 768 MB of ram to install
+ if (data.isRhel7OrGreater()) {
+ return Config.get().getInt(VIRT_MEM, 768);
+ }
return Config.get().getInt(VIRT_MEM, 512);
}
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
index 34fba87..6eb9340 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
@@ -769,6 +769,16 @@ public class KickstartData {
}
/**
+ * @return if this kickstart profile is rhel 7 installer type
+ */
+ public boolean isRhel7() {
+ if (getInstallType() != null) {
+ return getInstallType().isRhel7();
+ }
+ return false;
+ }
+
+ /**
* @return if this kickstart profile is rhel 5 installer type
*/
public boolean isRhel5() {
@@ -779,6 +789,16 @@ public class KickstartData {
}
/**
+ * @return if this kickstart profile is rhel 7 installer type or greater (for rhel8)
+ */
+ public boolean isRhel7OrGreater() {
+ if (getInstallType() != null) {
+ return (getInstallType().isRhel7OrGreater() || getInstallType().isFedora());
+ }
+ return false;
+ }
+
+ /**
* @return if this kickstart profile is rhel 6 installer type or greater (for rhel7)
*/
public boolean isRhel6OrGreater() {
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartInstallType.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartInstallType.java
index 989e040..0c6e559 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartInstallType.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartInstallType.java
@@ -40,12 +40,17 @@ public class KickstartInstallType extends BaseDomainHelper {
private String name;
/**
+ * @return if this installer type is rhel 7 or greater (for rhel8)
+ */
+ public boolean isRhel7OrGreater() {
+ return (isRhel6OrGreater() && !isRhel6());
+ }
+
+ /**
* @return if this installer type is rhel 6 or greater (for rhel7)
*/
public boolean isRhel6OrGreater() {
- // we need to reverse logic here
- return (!isRhel2() && !isRhel3() && !isRhel4() && !isRhel5() && !isFedora() &&
- !isGeneric());
+ return (isRhel5OrGreater() && !isRhel5());
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java
index abc0249..850dba5 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java
@@ -157,7 +157,8 @@ public class KickstartDetailsEditAction extends BaseKickstartEditAction {
form.set(VIRT_BRIDGE, data.getDefaultVirtBridge());
form.set(VIRT_CPU, ConfigDefaults.get().getDefaultVirtCpus());
form.set(VIRT_DISK_SIZE, ConfigDefaults.get().getDefaultVirtDiskSize());
- form.set(VIRT_MEMORY, ConfigDefaults.get().getDefaultVirtMemorySize());
+ form.set(VIRT_MEMORY, ConfigDefaults.get()
+ .getDefaultVirtMemorySize(data));
}
else {
setFormValueOrDefault(form, VIRT_BRIDGE, prof.getVirtBridge(),
@@ -167,7 +168,7 @@ public class KickstartDetailsEditAction extends BaseKickstartEditAction {
setFormValueOrDefault(form, VIRT_DISK_SIZE, prof.getVirtFileSize(),
ConfigDefaults.get().getDefaultVirtDiskSize());
setFormValueOrDefault(form, VIRT_MEMORY, prof.getVirtRam(),
- ConfigDefaults.get().getDefaultVirtMemorySize());
+ ConfigDefaults.get().getDefaultVirtMemorySize(data));
}
ctx.getRequest().setAttribute(IS_VIRT, Boolean.TRUE);
}
@@ -285,9 +286,15 @@ public class KickstartDetailsEditAction extends BaseKickstartEditAction {
* @param ksdata the kickstart data
* @param form the form
* @param user the user
+ * @throws ValidatorException if there is not enough ram
*/
- public static void processCobblerFormValues(KickstartData ksdata,
- DynaActionForm form, User user) {
+ public static void processCobblerFormValues(KickstartData ksdata, DynaActionForm form,
+ User user) throws ValidatorException {
+ int virtMemory = (Integer) form.get(VIRT_MEMORY);
+ if (ksdata.isRhel7OrGreater() && virtMemory < 768) {
+ ValidatorException.raiseException("kickstart.cobbler.profile.notenoughmemory");
+ }
+
CobblerProfileEditCommand cmd = new CobblerProfileEditCommand(ksdata, user);
cmd.setKernelOptions(StringUtils.defaultString(form.getString(KERNEL_OPTIONS)));
@@ -302,7 +309,7 @@ public class KickstartDetailsEditAction extends BaseKickstartEditAction {
}
if (KickstartDetailsEditAction.canSaveVirtOptions(ksdata, form)) {
- prof.setVirtRam((Integer) form.get(VIRT_MEMORY));
+ prof.setVirtRam(virtMemory);
prof.setVirtCpus((Integer) form.get(VIRT_CPU));
prof.setVirtFileSize((Integer) form.get(VIRT_DISK_SIZE));
prof.setVirtBridge(form.getString(VIRT_BRIDGE));
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index 18d3753..88f9c93 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -7640,6 +7640,9 @@ Follow this url to see the full list of inactive systems:
<trans-unit id="message.crashnoteupdated">
<source>Crash Note was successfully updated.</source>
</trans-unit>
+ <trans-unit id="kickstart.cobbler.profile.notenoughmemory">
+ <source>Red Hat Enterprise Linux 7 and higher guests require at least 768 MB of memory.</source>
+ </trans-unit>
<trans-unit id="kickstart.cobbler.profile.invalidvirt">
<source>Para-Virtualization is unsupported with the selected kickstart tree or distribution.</source>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SelectableDecorator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SelectableDecorator.java
index b5b978b..824d662 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SelectableDecorator.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SelectableDecorator.java
@@ -65,6 +65,9 @@ public class SelectableDecorator extends BaseListDecorator {
renderSelectedCaption(false);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void onFooterExtraAddons() throws JspException {
renderSelectButtons();
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCreateCommand.java
index 6c9d42f..9967864 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCreateCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCreateCommand.java
@@ -73,7 +73,7 @@ public class CobblerProfileCreateCommand extends CobblerProfileCommand {
KickstartFactory.saveKickstartData(this.ksData);
prof.setVirtBridge(this.ksData.getDefaultVirtBridge());
prof.setVirtCpus(ConfigDefaults.get().getDefaultVirtCpus());
- prof.setVirtRam(ConfigDefaults.get().getDefaultVirtMemorySize());
+ prof.setVirtRam(ConfigDefaults.get().getDefaultVirtMemorySize(this.ksData));
prof.setVirtFileSize(ConfigDefaults.get().getDefaultVirtDiskSize());
prof.setKickstart(this.ksData.buildCobblerFileName());
prof.save();
10 years, 5 months
Changes to 'refs/tags/spacewalk-java-2.1.92-1'
by Tomáš Kašpárek
Tag 'spacewalk-java-2.1.92-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-12-10 16:17 +0000
Tagging package [spacewalk-java] version [2.1.92-1] in directory [java/].
Changes since spacewalk-web-2.1.40-1:
Michael Mraka (2):
ported System Group / Admins to java
System Group / Admins - updated links and removed old page
Tomas Kasparek (4):
bootstrap tuning: icon tag for simpler icon inserting
use static code for icons map in IconTag + typo and documentation fix
bootstrap tuning: use new icon tag
Automatic commit of package [spacewalk-java] release [2.1.92-1].
---
java/code/src/com/redhat/rhn/frontend/action/groups/AdminListAction.java | 132 +++++++++
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 9
java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java | 145 ++++++++++
java/code/src/com/redhat/rhn/frontend/taglibs/rhn-taglib.tld | 15 +
java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java | 10
java/code/src/com/redhat/rhn/manager/user/UserManager.java | 65 +++-
java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp | 6
java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp | 10
java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp | 6
java/code/webapp/WEB-INF/includes/legends/system-legend.jsp | 24 -
java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp | 26 -
java/code/webapp/WEB-INF/nav/system_group_detail.xml | 2
java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp | 2
java/code/webapp/WEB-INF/pages/groups/adminlist.jsp | 73 +++++
java/code/webapp/WEB-INF/pages/groups/detail.jsp | 8
java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 6
java/code/webapp/WEB-INF/struts-config.xml | 15 +
java/spacewalk-java.spec | 9
rel-eng/packages/spacewalk-java | 2
web/html/network/systems/groups/admin_list.pxt | 50 ---
web/include/nav/system_group_detail.xml | 2
22 files changed, 512 insertions(+), 107 deletions(-)
---
10 years, 5 months
java/spacewalk-java.spec rel-eng/packages
by Tomáš Kašpárek
java/spacewalk-java.spec | 9 ++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 06554dc9efe675ff33ad261191c2974af8ce6da9
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Dec 10 17:17:37 2013 +0100
Automatic commit of package [spacewalk-java] release [2.1.92-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index c871028..943b818 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.91
+Version: 2.1.92
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -785,6 +785,13 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Dec 10 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.92-1
+- bootstrap tuning: use new icon tag
+- use static code for icons map in IconTag + typo and documentation fix
+- System Group / Admins - updated links and removed old page
+- ported System Group / Admins to java
+- bootstrap tuning: icon tag for simpler icon inserting
+
* Mon Dec 09 2013 Jan Dobes 2.1.91-1
- system group details - linking + cleanup
- converting system group details page to java
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 3f07c31..d93ca7f 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.91-1 java/
+2.1.92-1 java/
10 years, 5 months
2 commits - java/code
by Tomáš Kašpárek
java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java | 62 ++++------
java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp | 6
java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp | 10 -
java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp | 6
java/code/webapp/WEB-INF/includes/legends/system-legend.jsp | 24 +--
java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp | 26 ++--
java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp | 2
java/code/webapp/WEB-INF/pages/groups/detail.jsp | 6
java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 6
10 files changed, 72 insertions(+), 78 deletions(-)
New commits:
commit 14fea5fcdec801ecb3dcebe24b2d08288e21207d
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Dec 10 13:10:14 2013 +0100
bootstrap tuning: use new icon tag
diff --git a/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp
index 21c65a9..21a8ab4 100644
--- a/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp
+++ b/java/code/webapp/WEB-INF/includes/legends/errata-legend.jsp
@@ -3,8 +3,8 @@
<div class="sideleg">
<h4><bean:message key="errata-legend.jsp.title"/></h4>
<ul>
- <li><i class="fa fa-shield fa-1-5x"></i><bean:message key="errata-legend.jsp.security"/></li>
- <li><i class="fa fa-bug fa-1-5x"></i><bean:message key="errata-legend.jsp.bugfix"/></li>
- <li><i class="fa fa-1-5x spacewalk-icon-enhancement"></i><bean:message key="errata-legend.jsp.enhancement"/></li>
+ <li><rhn:icon type="errata-security" /><bean:message key="errata-legend.jsp.security"/></li>
+ <li><rhn:icon type="errata-bugfix" /><bean:message key="errata-legend.jsp.bugfix"/></li>
+ <li><rhn:icon type="errata-enhancement" /><bean:message key="errata-legend.jsp.enhancement"/></li>
</ul>
</div>
diff --git a/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp
index 6425102..f7b3fff 100644
--- a/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp
+++ b/java/code/webapp/WEB-INF/includes/legends/probes-list-legend.jsp
@@ -3,19 +3,19 @@
<div class="sideleg">
<h4><bean:message key="probes-list-legend.jsp.title"/></h4>
<ul>
- <li><i class="fa fa-1-5x spacewalk-icon-health text-success"></i>
+ <li><rhn:icon type="monitoring-ok" />
<bean:message key="probes-list-legend.jsp.ok"/>
</li>
- <li><i class="fa fa-1-5x spacewalk-icon-health text-warning"></i>
+ <li><rhn:icon type="monitoring-warn" />
<bean:message key="probes-list-legend.jsp.warning"/>
</li>
- <li><i class="fa fa-1-5x spacewalk-icon-health text-danger"></i>
+ <li><rhn:icon type="monitoring-crit" />
<bean:message key="probes-list-legend.jsp.critical"/>
</li>
- <li><i class="fa fa-1-5x spacewalk-icon-health-unknown"></i>
+ <li><rhn:icon type="monitoring-unknown" />
<bean:message key="probes-list-legend.jsp.unknown"/>
</li>
- <li><i class="fa fa-1-5x spacewalk-icon-health-pending"></i>
+ <li><rhn:icon type="monitoring-pending" />
<bean:message key="probes-list-legend.jsp.pending"/>
</li>
</ul>
diff --git a/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp
index 4930bf0..be4d95d 100644
--- a/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp
+++ b/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp
@@ -3,8 +3,8 @@
<div class="sideleg">
<h4><bean:message key="system-group-legend.jsp.title"/></h4>
<ul>
- <li><i class="fa fa-check-circle fa-1-5x text-success"></i><bean:message key="system-group-legend.jsp.fully"/></li>
- <li><i class="fa fa-exclamation-circle fa-1-5x text-danger"></i><bean:message key="system-group-legend.jsp.updates"/></li>
- <li><i class="fa fa-exclamation-triangle fa-1-5x text-warning"></i><bean:message key="system-group-legend.jsp.critical"/></li>
+ <li><rhn:icon type="system-ok" /><bean:message key="system-group-legend.jsp.fully"/></li>
+ <li><rhn:icon type="system-crit"><bean:message key="system-group-legend.jsp.updates"/></li>
+ <li><rhn:icon type="system-warn"><bean:message key="system-group-legend.jsp.critical"/></li>
</ul>
</div>
diff --git a/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp
index 4738a39..4715244 100644
--- a/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp
+++ b/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp
@@ -4,23 +4,23 @@
<div class="sideleg">
<h4><bean:message key="system-legend.jsp.title"/></h4>
<ul>
- <li><i class="fa fa-check-circle fa-1-5x text-success"></i><bean:message key="system-legend.jsp.fully"/></li>
- <li><i class="fa fa-exclamation-circle fa-1-5x text-danger"></i><bean:message key="system-legend.jsp.critical"/></li>
- <li><i class="fa fa-exclamation-triangle fa-1-5x text-warning"></i><bean:message key="system-legend.jsp.updates"/></li>
- <li><i class="fa fa-1-5x spacewalk-icon-unknown-system"></i><bean:message key="system-legend.jsp.notcheckingin"/></li>
+ <li><rhn:icon type="system-ok" /><bean:message key="system-legend.jsp.fully"/></li>
+ <li><rhn:icon type="system-crit" /><bean:message key="system-legend.jsp.critical"/></li>
+ <li><rhn:icon type="system-warn" /><bean:message key="system-legend.jsp.updates"/></li>
+ <li><rhn:icon type="system-unknown" /><bean:message key="system-legend.jsp.notcheckingin"/></li>
<rhn:require acl="org_entitlement(sw_mgr_enterprise)">
- <li><i class="fa fa-1-5x spacewalk-icon-locked-system"></i><bean:message key="system-legend.jsp.locked"/></li>
+ <li><rhn:icon type="system-locked" /><bean:message key="system-legend.jsp.locked"/></li>
</rhn:require>
<rhn:require acl="org_entitlement(rhn_provisioning)">
- <li><i class="fa fa-rocket fa-1-5x"></i><bean:message key="system-legend.jsp.kickstarting"/></li>
+ <li><rhn:icon type="system-kickstarting" /><bean:message key="system-legend.jsp.kickstarting"/></li>
</rhn:require>
- <li><i class="fa fa-clock-o fa-1-5x"></i><bean:message key="system-legend.jsp.pending"/></li>
- <li><i class="fa fa-1-5x spacewalk-icon-Unentitled"></i><bean:message key="system-legend.jsp.unentitled"/></li>
+ <li><rhn:icon type="actions-pending" /><bean:message key="system-legend.jsp.pending"/></li>
+ <li><rhn:icon type="system-unentitled" /><bean:message key="system-legend.jsp.unentitled"/></li>
<rhn:require acl="org_entitlement(rhn_monitor)">
- <li><i class="fa fa-1-5x spacewalk-icon-monitoring-status"></i><bean:message key="system-legend.jsp.monitoring"/></li>
+ <li><rhn:icon type="monitoring-status" /><bean:message key="system-legend.jsp.monitoring"/></li>
</rhn:require>
- <li><i class="fa fa-1-5x spacewalk-icon-virtual-host"></i><bean:message key="systemlist.jsp.virthost"/></li>
- <li><i class="fa fa-1-5x spacewalk-icon-virtual-guest"></i><bean:message key="systemlist.jsp.virtguest"/></li>
- <li><i class="fa fa-desktop fa-1-5x"></i><bean:message key="systemlist.jsp.nonvirt"/></li>
+ <li><rhn:icon type="system-virt-host" /><bean:message key="systemlist.jsp.virthost"/></li>
+ <li><rhn:icon type="system-virt-guest" /><bean:message key="systemlist.jsp.virtguest"/></li>
+ <li><rhn:icon type="system-physical" /><bean:message key="systemlist.jsp.nonvirt"/></li>
</ul>
</div>
diff --git a/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp
index b2ef929..bba804f 100644
--- a/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp
+++ b/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp
@@ -4,24 +4,24 @@
<div class="sideleg">
<h4><bean:message key="yourrhn-legend.jsp.title" /></h4>
<ul>
- <li><i class="fa fa-check-circle fa-1-5x text-success"></i><bean:message key="system-legend.jsp.fully" /></li>
- <li><i class="fa fa-exclamation-circle fa-1-5x text-danger"></i><bean:message key="system-legend.jsp.critical" /></li>
- <li><i class="fa fa-exclamation-triangle fa-1-5x text-warning"></i><bean:message key="system-legend.jsp.updates" /></li>
- <li><i class="fa fa-1-5x spacewalk-icon-unknown-system"></i><bean:message key="system-legend.jsp.notcheckingin" /></li>
+ <li><rhn:icon type="system-ok" /><bean:message key="system-legend.jsp.fully" /></li>
+ <li><rhn:icon type="system-crit" /><bean:message key="system-legend.jsp.critical" /></li>
+ <li><rhn:icon type="system-warn" /><bean:message key="system-legend.jsp.updates" /></li>
+ <li><rhn:icon type="system-unknown" /><bean:message key="system-legend.jsp.notcheckingin" /></li>
<rhn:require acl="org_entitlement(sw_mgr_enterprise)">
- <li><i class="fa fa-1-5x spacewalk-icon-locked-system"></i><bean:message key="system-legend.jsp.locked" /></li>
+ <li><rhn:icon type="system-locked" /><bean:message key="system-legend.jsp.locked" /></li>
</rhn:require>
<rhn:require acl="org_entitlement(rhn_provisioning)">
- <li><i class="fa fa-rocket fa-1-5x"></i><bean:message key="system-legend.jsp.kickstarting" /></li>
+ <li><rhn:icon type="system-kickstarting" /><bean:message key="system-legend.jsp.kickstarting" /></li>
</rhn:require>
- <li><i class="fa fa-clock-o fa-1-5x"></i><bean:message key="system-legend.jsp.pending" /></li>
- <li><i class="fa fa-times-circle-o fa-1-5x text-danger"></i><bean:message key="yourrhn-legend.jsp.failedactions" /></li>
- <li><i class="fa fa-check-circle-o fa-1-5x text-success"></i><bean:message key="yourrhn-legend.jsp.completedactions" /></li>
+ <li><rhn:icon type="actions-pending" /><bean:message key="system-legend.jsp.pending" /></li>
+ <li><rhn:icon type="actions-failed" /><bean:message key="yourrhn-legend.jsp.failedactions" /></li>
+ <li><rhn:icon type="actions-ok" /><bean:message key="yourrhn-legend.jsp.completedactions" /></li>
<rhn:require acl="show_monitoring();" mixins="com.redhat.rhn.common.security.acl.MonitoringAclHandler">
- <li><i class="fa fa-1-5x spacewalk-icon-monitoring-status"></i><bean:message key="system-legend.jsp.monitoring" /></li>
+ <li><rhn:icon type="monitoring-status" /><bean:message key="system-legend.jsp.monitoring" /></li>
</rhn:require>
- <li><i class="fa fa-shield fa-1-5x"></i><bean:message key="errata-legend.jsp.security" /></li>
- <li><i class="fa fa-bug fa-1-5x"></i><bean:message key="errata-legend.jsp.bugfix" /></li>
- <li><i class="fa fa-1-5x spacewalk-icon-enhancement"></i><bean:message key="errata-legend.jsp.enhancement" /></li>
+ <li><rhn:icon type="errata-security" /><bean:message key="errata-legend.jsp.security" /></li>
+ <li><rhn:icon type="errata-bugfix" /><bean:message key="errata-legend.jsp.bugfix" /></li>
+ <li><rhn:icon type="errata-enhance" /><bean:message key="errata-legend.jsp.enhancement" /></li>
</ul>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf
index befbbd5..76dc5df 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf
@@ -38,7 +38,7 @@
<i class="fa fa-warning text-warning" title="<bean:message key='grouplist.jsp.updates'/>"></i>
</c:when>
<c:otherwise>
- <i class="fa fa-check-circle fa-1-5x text-success" title="<bean:message key='grouplist.jsp.noerrata'/>"></i>
+ <rhn:icon type="system-ok" title="<bean:message key='grouplist.jsp.noerrata'/>" />
</c:otherwise>
</c:choose>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp
index 7b8c1c6..5dcd19b 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp
@@ -24,7 +24,7 @@
<i class="fa fa-exclamation-circle fa-1-5x text-warning" title="<bean:message key='grouplist.jsp.updates'/>"></i>
</c:when>
<c:otherwise>
- <i class="fa fa-check-circle fa-1-5x text-success" title="<bean:message key='grouplist.jsp.noerrata'/>"></i>
+ <rhn:icon type="system-ok" title="<bean:message key='grouplist.jsp.noerrata'/>" />
</c:otherwise>
</c:choose>
</a>
diff --git a/java/code/webapp/WEB-INF/pages/groups/detail.jsp b/java/code/webapp/WEB-INF/pages/groups/detail.jsp
index 5b68d73..8816d20 100644
--- a/java/code/webapp/WEB-INF/pages/groups/detail.jsp
+++ b/java/code/webapp/WEB-INF/pages/groups/detail.jsp
@@ -26,17 +26,17 @@
<td>
<div class="system-status">
<c:if test="${errata_counts['se'] > 0}">
- <i class="fa fa-exclamation-circle fa-1-5x text-danger"></i>
+ <rhn:icon type="system-crit" />
<span class="system-status-critical-updates"><bean:message key="systemgroup.details.criticalupdates"/></span>
<a class="btn btn-danger" href="/network/systems/groups/errata_list.pxt?sgid=${id}">${errata_counts['se']} <i class="fa fa-arrow-right"></i></a>
</c:if>
<c:if test="${(errata_counts['se'] == 0) && ((errata_counts['be'] > 0) || (errata_counts['ee'] > 0))}">
- <i class="fa fa-exclamation-triangle fa-1-5x text-warning"></i>
+ <rhn:icon type="system-warn" />
<span class="system-status-updates"><bean:message key="systemgroup.details.someupdates"/></span>
<a class="btn btn-warning" href="/network/systems/groups/errata_list.pxt?sgid=${id}"><i class="fa fa-arrow-right"></i></a>
</c:if>
<c:if test="${(errata_counts['se'] == 0) && (errata_counts['be'] == 0) && (errata_counts['ee'] == 0)}">
- <i class="fa fa-check-circle fa-1-5x text-success"></i>
+ <rhn:icon type="system-ok" />
<span class="system-status-up-to-date"><bean:message key="systemgroup.details.noupdates"/></span>
</c:if>
</div>
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 20d03d6..2133762 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
@@ -27,10 +27,10 @@
<c:when test="${hasUpdates}">
<c:choose>
<c:when test="${criticalErrataCount > 0}">
- <i class="fa fa-exclamation-circle fa-1-5x text-danger"></i>
+ <rhn:icon type="system-crit" />
</c:when>
<c:otherwise>
- <i class="fa fa-exclamation-triangle fa-1-5x text-warning"></i>
+ <rhn:icon type="system-warn" />
</c:otherwise>
</c:choose>
@@ -48,7 +48,7 @@
</c:when>
<c:otherwise>
- <i class="fa fa-check-circle fa-1-5x text-success"></i> <bean:message key="sdc.details.overview.updated"/>
+ <rhn:icon type="system-ok" /> <bean:message key="sdc.details.overview.updated"/>
</c:otherwise>
</c:choose>
commit 5fd6cbb8d924412daa9513c2f030e072afc86a7a
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Dec 10 13:08:47 2013 +0100
use static code for icons map in IconTag + typo and documentation fix
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
index b513c08..64bd363 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2009--2013 Red Hat, Inc.
+ * Copyright (c) 2013 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
@@ -26,9 +26,7 @@ import javax.servlet.jsp.tagext.TagSupport;
/**
* Tag to easy display the icons
* <pre>
- * <rhn:icon type="$type">
- * <c:out escapeXml="false" value="${message}" />
- * </rhn:messages>
+ * <rhn:icon type="$type" title="$title"/>
* </pre>
* @version $Rev$
*/
@@ -38,6 +36,32 @@ public class IconTag extends TagSupport {
private String title;
private static Map<String, String> icons;
+ static {
+ icons = new HashMap<String, String>();
+ icons.put("system-ok", "fa fa-check-circle fa-1-5x text-success");
+ icons.put("system-crit", "fa fa-exclamation-circle fa-1-5x text-danger");
+ icons.put("system-warn", "fa fa-exclamation-triangle fa-1-5x text-warning");
+ icons.put("system-unknown", "fa fa-1-5x spacewalk-icon-unknown-system");
+ icons.put("system-locked", "fa fa-1-5x spacewalk-icon-locked-system");
+ icons.put("system-kickstarting", "fa fa-rocket fa-1-5x");
+ icons.put("system-unentitled", "fa fa-1-5x spacewalk-icon-Unentitled");
+ icons.put("system-virt-host", "fa fa-1-5x spacewalk-icon-virtual-host");
+ icons.put("system-virt-guest", "fa fa-1-5x spacewalk-icon-virtual-guest");
+ icons.put("system-physical", "fa fa-desktop fa-1-5x");
+ icons.put("actions-pending", "fa fa-clock-o fa-1-5x");
+ icons.put("actions-ok", "fa fa-check-circle-o fa-1-5x text-success");
+ icons.put("actions-failed", "fa fa-times-circle-o fa-1-5x text-danger");
+ icons.put("errata-security", "fa fa-shield fa-1-5x");
+ icons.put("errata-bugfix", "fa fa-bug fa-1-5x");
+ icons.put("errata-enhance", "fa fa-1-5x spacewalk-icon-enhancement");
+ icons.put("monitoring-status", "fa fa-1-5x spacewalk-icon-monitoring-status");
+ icons.put("monitoring-ok", "fa fa-1-5x spacewalk-icon-health text-success");
+ icons.put("monitoring-warn", "fa fa-1-5x spacewalk-icon-health text-warning");
+ icons.put("monitoring-crit", "fa fa-1-5x spacewalk-icon-health text-danger");
+ icons.put("monitoring-unknown", "fa fa-1-5x spacewalk-icon-health-unknown");
+ icons.put("monitoring-pending", "fa fa-1-5x spacewalk-icon-health-pending");
+ }
+
/**
* Constructor for Icon tag.
*/
@@ -79,41 +103,11 @@ public class IconTag extends TagSupport {
return title;
}
- private void setUpSingleton() {
- if (icons == null) {
- icons = new HashMap<String, String>();
- icons.put("system-ok", "fa fa-check-circle fa-1-5x text-success");
- icons.put("system-crit", "fa fa-exclamation-circle fa-1-5x text-danger");
- icons.put("system-warn", "fa fa-exclamation-triangle fa-1-5x text-warning");
- icons.put("system-unknown", "fa fa-1-5x spacewalk-icon-unknown-system");
- icons.put("system-locked", "fa fa-1-5x spacewalk-icon-locked-system");
- icons.put("system-kickstarting", "fa fa-rocket fa-1-5x");
- icons.put("system-unentitled", "fa fa-1-5x spacewalk-icon-Unentitled");
- icons.put("system-virt-host", "fa fa-1-5x spacewalk-icon-virtual-host");
- icons.put("system-virt-guest", "fa fa-1-5x spacewalk-icon-virtual-guest");
- icons.put("system-physical", "fa fa-desktop fa-1-5x");
- icons.put("actions-pending", "fa fa-clock-o fa-1-5x");
- icons.put("actions-ok", "fa fa-check-circle-o fa-1-5x text-success");
- icons.put("action-failed", "fa fa-times-circle-o fa-1-5x text-danger");
- icons.put("errata-security", "fa fa-shield fa-1-5x");
- icons.put("errata-bugfix", "fa fa-bug fa-1-5x");
- icons.put("errata-enhance", "fa fa-1-5x spacewalk-icon-enhancement");
- icons.put("monitoring-status", "fa fa-1-5x spacewalk-icon-monitoring-status");
- icons.put("monitoring-ok", "fa fa-1-5x spacewalk-icon-health text-success");
- icons.put("monitoring-warn", "fa fa-1-5x spacewalk-icon-health text-warning");
- icons.put("monitoring-crit", "fa fa-1-5x spacewalk-icon-health text-danger");
- icons.put("monitoring-unknown", "fa fa-1-5x spacewalk-icon-health-unknown");
- icons.put("monitoring-pending", "fa fa-1-5x spacewalk-icon-health-pending");
- }
- }
-
/** {@inheritDoc}
* @throws JspException
*/
public int doStartTag() throws JspException {
- setUpSingleton();
-
if (!icons.containsKey(type)) {
throw new IllegalArgumentException("Unknown icon type: \"" + type + "\".");
}
10 years, 5 months
2 commits - java/code web/html web/include
by Michael Mraka
java/code/src/com/redhat/rhn/frontend/action/groups/AdminListAction.java | 132 ++++++++++
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 9
java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java | 10
java/code/src/com/redhat/rhn/manager/user/UserManager.java | 65 ++++
java/code/webapp/WEB-INF/nav/system_group_detail.xml | 2
java/code/webapp/WEB-INF/pages/groups/adminlist.jsp | 73 +++++
java/code/webapp/WEB-INF/pages/groups/detail.jsp | 2
java/code/webapp/WEB-INF/struts-config.xml | 15 +
web/html/network/systems/groups/admin_list.pxt | 50 ---
web/include/nav/system_group_detail.xml | 2
10 files changed, 299 insertions(+), 61 deletions(-)
New commits:
commit 899ef200605f19e4dff0d6e5217b8c65e49f89d9
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Dec 10 11:18:53 2013 +0100
System Group / Admins - updated links and removed old page
diff --git a/java/code/webapp/WEB-INF/nav/system_group_detail.xml b/java/code/webapp/WEB-INF/nav/system_group_detail.xml
index 7671f0a..f6953e1 100644
--- a/java/code/webapp/WEB-INF/nav/system_group_detail.xml
+++ b/java/code/webapp/WEB-INF/nav/system_group_detail.xml
@@ -15,7 +15,7 @@
<rhn-tab-url>/network/systems/groups/apply_errata_confirm.pxt</rhn-tab-url>
</rhn-tab>
- <rhn-tab name="Admins" url="/network/systems/groups/admin_list.pxt" acl="user_role(system_group_admin)" />
+ <rhn-tab name="Admins" url="/rhn/groups/AdminList.do" acl="user_role(system_group_admin)" />
<rhn-tab name="Probes" url="/network/systems/groups/probe_list.pxt" acl="org_entitlement(rhn_monitor)" />
diff --git a/java/code/webapp/WEB-INF/pages/groups/detail.jsp b/java/code/webapp/WEB-INF/pages/groups/detail.jsp
index 1064e6f..5b68d73 100644
--- a/java/code/webapp/WEB-INF/pages/groups/detail.jsp
+++ b/java/code/webapp/WEB-INF/pages/groups/detail.jsp
@@ -55,7 +55,7 @@
<rhn:require acl="user_role(org_admin) or user_role(system_group_admin)">
<br />
- <a href="/network/systems/groups/admin_list.pxt?sgid=${id}"><bean:message key="systemgroup.details.manageadmins"/></a>
+ <a href="/rhn/groups/AdminList.do?sgid=${id}"><bean:message key="systemgroup.details.manageadmins"/></a>
</rhn:require>
</td>
</tr>
diff --git a/web/html/network/systems/groups/admin_list.pxt b/web/html/network/systems/groups/admin_list.pxt
deleted file mode 100644
index 218a83f..0000000
--- a/web/html/network/systems/groups/admin_list.pxt
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pxt-passthrough>
- <pxt-use class="Grail::Frame" />
- <pxt-use class="Sniglets::Users" />
- <pxt-use class="Sniglets::ServerGroup" />
- <pxt-use class="Sniglets::Lists" />
- <pxt-use class="Sniglets::Navi" />
- <pxt-use class="Sniglets::HTML" />
-
- <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
-
-<pxt-include file="/network/components/system_groups/sgdc_header.pxi" />
-
- <h2>
- Group Administrators
- </h2>
-
- <div class="page-summary">
- <p>Checked users may administer the systems in this group. Org Admins
- may always administer all systems. System Group Admins are marked with
- (*) and may modify all aspects of system groups assigned to them.</p>
- </div>
-
-<pxt-include-late file="/network/components/message_queues/local.pxi" />
-
-<rhn-listview class="Sniglets::ListView::UserList" mode="group_admins">
- <formvars>
- <var name="sgid" />
- </formvars>
-
- <column name="Admin" label="group_admin_checkbox" width="5%" align="center" />
-
- <column name="Username" label="login" align="left">
- <rhn-require acl="user_role(org_admin)">
- <url>/rhn/users/UserDetails.do?uid={column:id}</url>
- </rhn-require>
- </column>
-
- <column name="Full Name" label="full_name" />
-
- <column name="Status" label="disabled" />
-
- <action name="Update" label="update_system_group_membership" />
-
- <empty_list_message>No Groups Available.</empty_list_message>
-</rhn-listview>
-
- </grail-canvas-template>
-</pxt-passthrough>
-
diff --git a/web/include/nav/system_group_detail.xml b/web/include/nav/system_group_detail.xml
index 7671f0a..f6953e1 100644
--- a/web/include/nav/system_group_detail.xml
+++ b/web/include/nav/system_group_detail.xml
@@ -15,7 +15,7 @@
<rhn-tab-url>/network/systems/groups/apply_errata_confirm.pxt</rhn-tab-url>
</rhn-tab>
- <rhn-tab name="Admins" url="/network/systems/groups/admin_list.pxt" acl="user_role(system_group_admin)" />
+ <rhn-tab name="Admins" url="/rhn/groups/AdminList.do" acl="user_role(system_group_admin)" />
<rhn-tab name="Probes" url="/network/systems/groups/probe_list.pxt" acl="org_entitlement(rhn_monitor)" />
commit e17da982bd6c2676b721164eb5b3801fc5c0941f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Dec 10 11:17:47 2013 +0100
ported System Group / Admins to java
diff --git a/java/code/src/com/redhat/rhn/frontend/action/groups/AdminListAction.java b/java/code/src/com/redhat/rhn/frontend/action/groups/AdminListAction.java
new file mode 100644
index 0000000..e63a7da
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/action/groups/AdminListAction.java
@@ -0,0 +1,132 @@
+/**
+ * Copyright (c) 2013 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.groups;
+
+import com.redhat.rhn.domain.server.ManagedServerGroup;
+import com.redhat.rhn.domain.server.ServerGroupFactory;
+import com.redhat.rhn.domain.role.RoleFactory;
+import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.action.common.BadParameterException;
+import com.redhat.rhn.frontend.dto.UserOverview;
+import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.StrutsDelegate;
+import com.redhat.rhn.frontend.taglibs.list.helper.ListRhnSetHelper;
+import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
+import com.redhat.rhn.frontend.xmlrpc.PermissionCheckFailureException;
+import com.redhat.rhn.manager.rhnset.RhnSetDecl;
+import com.redhat.rhn.manager.user.UserManager;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+
+/**
+ * AdminListAction
+ */
+public class AdminListAction extends RhnAction implements Listable {
+
+
+ /** {@inheritDoc} */
+ public ActionForward execute(ActionMapping mapping,
+ ActionForm formIn,
+ HttpServletRequest request,
+ HttpServletResponse response) {
+
+ RequestContext requestContext = new RequestContext(request);
+ ManagedServerGroup serverGroup = requestContext.lookupAndBindServerGroup();
+ User user = requestContext.getCurrentUser();
+
+ if (serverGroup == null) {
+ throw new BadParameterException("Invalid " + RequestContext.SERVER_GROUP_ID +
+ " parameter:" + serverGroup.getId());
+ }
+
+
+ ListRhnSetHelper helper = new ListRhnSetHelper(this, request,
+ RhnSetDecl.setForSystemGroupAdmins(serverGroup));
+ Set<Long> preselected = new HashSet<Long>();
+ for (User item : (List<User>) ServerGroupFactory.listAdministrators(serverGroup)) {
+ preselected.add(item.getId());
+ }
+ helper.preSelect(preselected);
+
+ Map params = makeParamMap(request);
+ params.put(RequestContext.SERVER_GROUP_ID, serverGroup.getId());
+
+ if (requestContext.isSubmitted()) {
+ // make sure the user has enough perms
+ if (!UserManager.canAdministerSystemGroup(user, serverGroup)) {
+ throw new PermissionCheckFailureException();
+ }
+
+ long updated = 0;
+ // remove admins
+ for (Iterator<Long> iter = helper.getRemovedKeys().iterator();
+ iter.hasNext();) {
+ Long uid = iter.next();
+ if (!UserManager.hasRole(uid, RoleFactory.ORG_ADMIN)) {
+ UserManager.revokeServerGroupPermission(uid, serverGroup.getId());
+ }
+ updated++;
+ }
+
+ // add group admins
+ for (Iterator<Long> iter = helper.getAddedKeys().iterator(); iter.hasNext();) {
+ Long uid = iter.next();
+ if (!UserManager.hasRole(uid, RoleFactory.ORG_ADMIN)) {
+ UserManager.revokeServerGroupPermission(uid, serverGroup.getId());
+ UserManager.grantServerGroupPermission(uid, serverGroup.getId());
+ }
+ updated++;
+ }
+ if (updated > 0) {
+ createSuccessMessage(request, "systemgroup.admins.updated",
+ serverGroup.getName());
+ }
+ return StrutsDelegate.getInstance().forwardParams(
+ mapping.findForward("submitted"), params);
+ }
+
+ helper.execute();
+
+ return StrutsDelegate.getInstance().forwardParams(
+ mapping.findForward("default"), params);
+ }
+
+ /** {@inheritDoc} */
+ public List getResult(RequestContext context) {
+ User currentUser = context.getCurrentUser();
+ List<UserOverview> userList = UserManager.activeInOrg2(currentUser);
+ for (UserOverview uo : userList) {
+ if (UserManager.hasRole(uo.getId(), RoleFactory.ORG_ADMIN)) {
+ uo.setDisabled(true);
+ }
+ else if (UserManager.hasRole(uo.getId(), RoleFactory.SYSTEM_GROUP_ADMIN)) {
+ uo.setLogin(uo.getLogin() + "*");
+ }
+ }
+ return userList;
+ }
+}
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 3a04505..c83168e 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
@@ -5240,6 +5240,15 @@ value for this entitlement, excluding the default organization's consumption.</s
<trans-unit id="systems.groups.jsp.add">
<source>Join Selected Groups</source>
</trans-unit>
+ <trans-unit id="systemgroup.admins.title">
+ <source>Group Administrators</source>
+ </trans-unit>
+ <trans-unit id="systemgroup.admins.summary">
+ <source>Checked users may administer the systems in this group. Org Admins may always administer all systems. System Group Admins are marked with (*) and may modify all aspects of system groups assigned to them.</source>
+ </trans-unit>
+ <trans-unit id="systemgroup.admins.updated">
+ <source>Admin list for system group <strong>{0}</strong> updated.</source>
+ </trans-unit>
<trans-unit id="systemgroup.target-systems.summary">
<source>The following are systems that may be added to this group.</source>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java b/java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java
index 3eb1775..1ebca1c 100644
--- a/java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java
+++ b/java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.common.util.Asserts;
import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.rhnset.RhnSet;
import com.redhat.rhn.domain.rhnset.SetCleanup;
+import com.redhat.rhn.domain.server.ManagedServerGroup;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.SetLabels;
@@ -549,6 +550,15 @@ public class RhnSetDecl {
return make("managers_for_channel" + chan.getId(), SetCleanup.NOOP);
}
+ /**
+ * get the set for system group admins
+ * @param sysgroup channel passed in
+ * @return the Set descl
+ */
+ public static RhnSetDecl setForSystemGroupAdmins(ManagedServerGroup sysgroup) {
+ return make("system_group_admins" + sysgroup.getId(), SetCleanup.NOOP);
+ }
+
public static final RhnSetDecl SYSTEM_NOTES = make("systems_notes",
SetCleanup.NOOP);
diff --git a/java/code/src/com/redhat/rhn/manager/user/UserManager.java b/java/code/src/com/redhat/rhn/manager/user/UserManager.java
index c82cd2c..bf758fa 100644
--- a/java/code/src/com/redhat/rhn/manager/user/UserManager.java
+++ b/java/code/src/com/redhat/rhn/manager/user/UserManager.java
@@ -28,6 +28,7 @@ import com.redhat.rhn.domain.org.Org;
import com.redhat.rhn.domain.org.OrgFactory;
import com.redhat.rhn.domain.role.Role;
import com.redhat.rhn.domain.role.RoleFactory;
+import com.redhat.rhn.domain.server.ManagedServerGroup;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.Address;
import com.redhat.rhn.domain.user.RhnTimeZone;
@@ -42,6 +43,7 @@ import com.redhat.rhn.frontend.listview.PageControl;
import com.redhat.rhn.frontend.taglibs.list.decorators.PageSizeDecorator;
import com.redhat.rhn.manager.BaseManager;
import com.redhat.rhn.manager.SatManager;
+import com.redhat.rhn.manager.system.ServerGroupManager;
import org.apache.log4j.Logger;
@@ -232,10 +234,10 @@ public class UserManager extends BaseManager {
/**
* Revokes permission from the given User to the ServerGroup whose id is sgid.
- * @param usr User who no longer needs permission
+ * @param uid Id of user who no longer needs permission
* @param sgid ServerGroup ID
*/
- public static void revokeServerGroupPermission(final User usr,
+ public static void revokeServerGroupPermission(final Long uid,
final long sgid) {
SelectMode sm = ModeFactory.getMode("User_queries",
"check_server_group_permissions_for_revoke");
@@ -243,25 +245,35 @@ public class UserManager extends BaseManager {
"remove_server_group_permissions");
Map params = new HashMap();
- params.put("user_id", usr.getId());
+ params.put("user_id", uid);
params.put("server_group_id", new Long(sgid));
DataResult dr = sm.execute(params);
for (Iterator itr = dr.iterator(); itr.hasNext();) {
Map row = (Map)itr.next();
- long uid = ((Long)row.get("user_id")).longValue();
- if (uid == usr.getId().longValue()) {
+ long ruid = ((Long)row.get("user_id")).longValue();
+ if (ruid == uid.longValue()) {
m.execute(params, new HashMap());
}
}
}
/**
+ * Revokes permission from the given User to the ServerGroup whose id is sgid.
+ * @param usr User who no longer needs permission
+ * @param sgid ServerGroup ID
+ */
+ public static void revokeServerGroupPermission(final User usr,
+ final long sgid) {
+ revokeServerGroupPermission(usr.getId(), sgid);
+ }
+
+ /**
* Grants the given User permission to the ServerGroup whose id is sgid.
- * @param usr User who needs permission
+ * @param uid Id of user who needs permission
* @param sgid ServerGroup ID
*/
- public static void grantServerGroupPermission(final User usr,
+ public static void grantServerGroupPermission(final Long uid,
final long sgid) {
SelectMode sm = ModeFactory.getMode("User_queries",
"check_server_group_permissions");
@@ -269,7 +281,7 @@ public class UserManager extends BaseManager {
"set_server_group_permissions");
Map params = new HashMap();
- params.put("user_id", usr.getId());
+ params.put("user_id", uid);
params.put("server_group_id", new Long(sgid));
DataResult dr = sm.execute(params);
@@ -279,6 +291,16 @@ public class UserManager extends BaseManager {
}
/**
+ * Grants the given User permission to the ServerGroup whose id is sgid.
+ * @param usr User who needs permission
+ * @param sgid ServerGroup ID
+ */
+ public static void grantServerGroupPermission(final User usr,
+ final long sgid) {
+ grantServerGroupPermission(usr.getId(), sgid);
+ }
+
+ /**
* Add and remove the specified roles from the user.
*
* @param usr The User who's Roles you want to update
@@ -515,6 +537,20 @@ public class UserManager extends BaseManager {
}
/**
+ * Check role for the specified user.
+ * @param uid The id of the user to lookup.
+ * @param label Role to check.
+ * @return the specified user.
+ */
+ public static boolean hasRole(Long uid, Role label) {
+ if (uid == null) {
+ return false;
+ }
+
+ return UserFactory.lookupById(uid).hasRole(label);
+ }
+
+ /**
* Retrieve the specified user, assuming that the User making the request
* has the required permissions.
* @param user The user making the lookup request
@@ -796,6 +832,19 @@ public class UserManager extends BaseManager {
}
/**
+ * can a system group be administered by user?
+ * @param user User
+ * @param group SystemGroup
+ * @return true if user can administer system group
+ */
+ public static boolean canAdministerSystemGroup(User user, ManagedServerGroup group) {
+ return (user != null &&
+ group != null &&
+ ServerGroupManager.getInstance().canAccess(user, group) &&
+ user.hasRole(RoleFactory.SYSTEM_GROUP_ADMIN));
+ }
+
+ /**
* Returns the System Groups associated with the given User
* bounded by the values of the PageControl.
* @param user User whose SystemGroups are sought.
diff --git a/java/code/webapp/WEB-INF/pages/groups/adminlist.jsp b/java/code/webapp/WEB-INF/pages/groups/adminlist.jsp
new file mode 100644
index 0000000..51d989e
--- /dev/null
+++ b/java/code/webapp/WEB-INF/pages/groups/adminlist.jsp
@@ -0,0 +1,73 @@
+<%@ 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" %>
+
+<html>
+<head>
+ <meta name="page-decorator" content="none" />
+</head>
+<body>
+
+<%@ include file="/WEB-INF/pages/common/fragments/groups/header.jspf" %>
+
+<h2>
+ <bean:message key="systemgroup.admins.title"/>
+</h2>
+
+<div class="page-summary">
+<bean:message key="systemgroup.admins.summary"/>
+</div>
+
+<rl:listset name="groupAdmins">
+ <rhn:csrf />
+ <input type="hidden" name="sgid" value="${systemgroup.id}" />
+
+ <rl:list>
+
+ <rl:decorator name="SelectableDecorator"/>
+ <rl:decorator name="PageSizeDecorator"/>
+
+ <rl:selectablecolumn value="${current.id}"
+ selected="${current.selected}"
+ disabled="${current.disabled}">
+ </rl:selectablecolumn>
+
+ <rl:column sortable="true"
+ bound="false"
+ headerkey="username.nopunc.displayname"
+ sortattr="login"
+ filterattr="name"
+ defaultsort="asc" >
+
+ <a href="/rhn/users/UserDetails.do?uid=${current.id}">
+ ${current.login}
+ </a>
+ </rl:column>
+
+ <rl:column sortable="false"
+ bound="false"
+ headerkey="realname.displayname" >
+ ${current.userLastName}, ${current.userFirstName}
+ </rl:column>
+
+ <rl:column sortable="true"
+ sortattr="status"
+ bound="false"
+ headerkey="userlist.jsp.status" >
+ ${current.status}
+ </rl:column>
+
+ </rl:list>
+
+ <div class="text-right">
+ <hr />
+ <input type="submit" name="confirm"
+ value="<bean:message key='message.Update'/>" />
+ </div>
+ <rhn:submitted/>
+
+</rl:listset>
+
+</body>
+</html>
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index 48e51ee..6ce376e 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -3866,6 +3866,21 @@
redirect="true" />
</action>
+
+ <action path="/groups/AdminList"
+ scope="request"
+ type="com.redhat.rhn.frontend.action.groups.AdminListAction"
+ className="com.redhat.rhn.frontend.struts.RhnActionMapping">
+ <set-property property="postRequiredIfSubmitted" value="true" />
+ <set-property property="acls"
+ value="user_role(system_group_admin)"/>
+ <forward name="default"
+ path="/WEB-INF/pages/groups/adminlist.jsp" />
+ <forward name="submitted"
+ path="/groups/AdminList.do"
+ redirect="true" />
+ </action>
+
<action path="/groups/AddSystems"
scope="request"
type="com.redhat.rhn.frontend.action.groups.AddSystemsAction"
10 years, 5 months
java/code
by Tomáš Kašpárek
java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java | 151 +++++++++++
java/code/src/com/redhat/rhn/frontend/taglibs/rhn-taglib.tld | 15 +
2 files changed, 166 insertions(+)
New commits:
commit 5f5a7ed0fe9161f37e75f2d8c4eaa9fd812fcd6a
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Dec 5 13:42:08 2013 +0100
bootstrap tuning: icon tag for simpler icon inserting
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
new file mode 100644
index 0000000..b513c08
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
@@ -0,0 +1,151 @@
+/**
+ * Copyright (c) 2009--2013 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.taglibs;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.TagSupport;
+
+/**
+ * Tag to easy display the icons
+ * <pre>
+ * <rhn:icon type="$type">
+ * <c:out escapeXml="false" value="${message}" />
+ * </rhn:messages>
+ * </pre>
+ * @version $Rev$
+ */
+public class IconTag extends TagSupport {
+
+ private String type;
+ private String title;
+ private static Map<String, String> icons;
+
+ /**
+ * Constructor for Icon tag.
+ */
+ public IconTag() {
+ super();
+ type = null;
+ title = null;
+ }
+
+ /**
+ * Set the type of the icon
+ * @param typeIn the type of the icon
+ */
+ public void setType(String typeIn) {
+ type = typeIn;
+ }
+
+ /**
+ * Get the type of the icon
+ * @return The type of the icon
+ */
+ public String getType() {
+ return type;
+ }
+
+ /**
+ * Set the title of the icon
+ * @param titleIn the title of the icon
+ */
+ public void setTitle(String titleIn) {
+ title = titleIn;
+ }
+
+ /**
+ * Get the title of the icon
+ * @return The title of the icon
+ */
+ public String getTitle() {
+ return title;
+ }
+
+ private void setUpSingleton() {
+ if (icons == null) {
+ icons = new HashMap<String, String>();
+ icons.put("system-ok", "fa fa-check-circle fa-1-5x text-success");
+ icons.put("system-crit", "fa fa-exclamation-circle fa-1-5x text-danger");
+ icons.put("system-warn", "fa fa-exclamation-triangle fa-1-5x text-warning");
+ icons.put("system-unknown", "fa fa-1-5x spacewalk-icon-unknown-system");
+ icons.put("system-locked", "fa fa-1-5x spacewalk-icon-locked-system");
+ icons.put("system-kickstarting", "fa fa-rocket fa-1-5x");
+ icons.put("system-unentitled", "fa fa-1-5x spacewalk-icon-Unentitled");
+ icons.put("system-virt-host", "fa fa-1-5x spacewalk-icon-virtual-host");
+ icons.put("system-virt-guest", "fa fa-1-5x spacewalk-icon-virtual-guest");
+ icons.put("system-physical", "fa fa-desktop fa-1-5x");
+ icons.put("actions-pending", "fa fa-clock-o fa-1-5x");
+ icons.put("actions-ok", "fa fa-check-circle-o fa-1-5x text-success");
+ icons.put("action-failed", "fa fa-times-circle-o fa-1-5x text-danger");
+ icons.put("errata-security", "fa fa-shield fa-1-5x");
+ icons.put("errata-bugfix", "fa fa-bug fa-1-5x");
+ icons.put("errata-enhance", "fa fa-1-5x spacewalk-icon-enhancement");
+ icons.put("monitoring-status", "fa fa-1-5x spacewalk-icon-monitoring-status");
+ icons.put("monitoring-ok", "fa fa-1-5x spacewalk-icon-health text-success");
+ icons.put("monitoring-warn", "fa fa-1-5x spacewalk-icon-health text-warning");
+ icons.put("monitoring-crit", "fa fa-1-5x spacewalk-icon-health text-danger");
+ icons.put("monitoring-unknown", "fa fa-1-5x spacewalk-icon-health-unknown");
+ icons.put("monitoring-pending", "fa fa-1-5x spacewalk-icon-health-pending");
+ }
+ }
+
+ /** {@inheritDoc}
+ * @throws JspException
+ */
+ public int doStartTag() throws JspException {
+
+ setUpSingleton();
+
+ if (!icons.containsKey(type)) {
+ throw new IllegalArgumentException("Unknown icon type: \"" + type + "\".");
+ }
+
+ JspWriter out = null;
+
+ try {
+ out = pageContext.getOut();
+
+ StringBuilder result = new StringBuilder();
+
+ result.append("<i class=\"" + icons.get(type) + "\"");
+ if (title != null) {
+ result.append(" title=\"" + title + "\"");
+ }
+ result.append("></i>");
+
+ out.print(result);
+ }
+ catch (IOException ioe) {
+ throw new JspException("IO error writing to JSP file:", ioe);
+ }
+ return SKIP_BODY;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void release() {
+ type = null;
+ title = null;
+ super.release();
+ }
+
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-taglib.tld b/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-taglib.tld
index 0014d89..851c66e 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-taglib.tld
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-taglib.tld
@@ -303,6 +303,21 @@
<required>false</required>
</attribute>
</tag>
+
+ <tag>
+ <name>icon</name>
+ <tag-class>com.redhat.rhn.frontend.taglibs.IconTag</tag-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <name>type</name>
+ <required>true</required>
+ </attribute>
+ <attribute>
+ <name>title</name>
+ <required>false</required>
+ </attribute>
+ </tag>
+
<tag>
<name>list</name>
<tag-class>com.redhat.rhn.frontend.taglibs.ListTag</tag-class>
10 years, 5 months
Branch 'master-bootstrap-css-fixes' - java/code
by Silvio Moioli
java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0b72f532771873d58ca5eaf24e0848aac5d59e98
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Tue Dec 10 09:56:45 2013 +0100
channel/manage/delete.jsp: disabled attribute fixed
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp
index f88ca7c..70416dd 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/delete.jsp
@@ -161,7 +161,7 @@
</html:submit>
</c:when>
<c:otherwise>
- <html:submit property="delete_button" disabled styleClass="btn">
+ <html:submit property="delete_button" disabled="true" styleClass="btn">
<bean:message key="channel.delete.jsp.channelheader"/>
</html:submit>
</c:otherwise>
10 years, 5 months
Changes to 'refs/tags/spacewalk-web-2.1.40-1'
by Jan Dobes
Tag 'spacewalk-web-2.1.40-1' created by Jan Dobes <jdobes(a)redhat.com> at 2013-12-09 18:11 +0000
Tagging package [spacewalk-web] version [2.1.40-1] in directory [web/].
Changes since spacewalk-java-2.1.91-1:
Jan Dobes (1):
Automatic commit of package [spacewalk-web] release [2.1.40-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
10 years, 5 months
rel-eng/packages web/spacewalk-web.spec
by Jan Dobes
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit ad6fbb641d7267b5a27ba199cbdc30e6f7c8b9db
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Mon Dec 9 19:11:30 2013 +0100
Automatic commit of package [spacewalk-web] release [2.1.40-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index c74b0ab..d111ed0 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-2.1.39-1 web/
+2.1.40-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 1ed4094..78567d3 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -4,7 +4,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 2.1.39
+Version: 2.1.40
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -269,6 +269,9 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Mon Dec 09 2013 Jan Dobes 2.1.40-1
+- system group details - linking + cleanup
+
* Wed Dec 04 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.39-1
- bootstrap tuning
10 years, 5 months
Changes to 'refs/tags/spacewalk-java-2.1.91-1'
by Jan Dobes
Tag 'spacewalk-java-2.1.91-1' created by Jan Dobes <jdobes(a)redhat.com> at 2013-12-09 18:09 +0000
Tagging package [spacewalk-java] version [2.1.91-1] in directory [java/].
Changes since rhn-client-tools-2.1.12-1:
Jan Dobes (3):
converting system group details page to java
system group details - linking + cleanup
Automatic commit of package [spacewalk-java] release [2.1.91-1].
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml | 9
java/code/src/com/redhat/rhn/domain/server/ManagedServerGroup.java | 11 +
java/code/src/com/redhat/rhn/frontend/action/groups/GroupDetailAction.java | 61 +++++
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 42 ++++
java/code/src/com/redhat/rhn/manager/system/ServerGroupManager.java | 18 +
java/code/webapp/WEB-INF/nav/system_group_detail.xml | 3
java/code/webapp/WEB-INF/pages/admin/assignedgroups.jsp | 2
java/code/webapp/WEB-INF/pages/common/fragments/activationkeys/groups.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf | 2
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/systemGroups.jsp | 4
java/code/webapp/WEB-INF/pages/groups/detail.jsp | 104 ++++++++++
java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemscompare.jsp | 2
java/code/webapp/WEB-INF/struts-config.xml | 9
java/spacewalk-java.spec | 10
rel-eng/packages/spacewalk-java | 2
spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 6
web/html/network/systems/groups/apply_errata_confirm.pxt | 2
web/html/network/systems/groups/details.pxt | 91 --------
web/html/network/systems/groups/edit_properties.pxt | 2
web/html/network/systems/ssm/groups/index.pxt | 2
web/include/nav/system_group_detail.xml | 3
web/modules/sniglets/Sniglets/ListView/SystemGroupList.pm | 2
23 files changed, 277 insertions(+), 114 deletions(-)
---
10 years, 5 months