java/code/src/com/redhat/rhn/frontend/action/ssm/ListSystemsAction.java | 48
++++------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2
java/code/webapp/WEB-INF/pages/ssm/systems/list.jsp | 5 -
java/spacewalk-java.spec | 13 ++
rel-eng/packages/spacewalk-java | 2
5 files changed, 35 insertions(+), 35 deletions(-)
New commits:
commit 894462646d9ed20257029b3a7740d9735c65d866
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Sep 16 17:59:27 2011 +0200
Automatic commit of package [spacewalk-java] release [1.6.47-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index eb86703..b443186 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.6.46
+Version: 1.6.47
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -557,6 +557,17 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Sep 16 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.47-1
+- 717984 - list only ssm systems in SSM Selected Systems List tab
+ (tlestach(a)redhat.com)
+- update copyright info (mzazrivec(a)redhat.com)
+- 619723 - Add support for open ranges, like bytes=9500- or bytes=-500.
+ (jpazdziora(a)redhat.com)
+- 509563 - add missing import (mzazrivec(a)redhat.com)
+- 509563 - remove system profile from cobbler during system deletion
+ (mzazrivec(a)redhat.com)
+- 732350 - link mchange-commons jar to taskomatic (tlestach(a)redhat.com)
+
* Fri Sep 16 2011 Jan Pazdziora 1.6.46-1
- CVE-2011-2927, 730955 - remove markup from localized string resources as
well.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 16e96ee..4f2caf4 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.6.46-1 java/
+1.6.47-1 java/
commit 862ff9d0078c416fd91b961a327afe2a8eca4a6d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Sep 16 17:15:49 2011 +0200
717984 - list only ssm systems in SSM Selected Systems List tab
diff --git a/java/code/src/com/redhat/rhn/frontend/action/ssm/ListSystemsAction.java
b/java/code/src/com/redhat/rhn/frontend/action/ssm/ListSystemsAction.java
index 489bebd..591be43 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/ssm/ListSystemsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/ssm/ListSystemsAction.java
@@ -14,17 +14,18 @@
*/
package com.redhat.rhn.frontend.action.ssm;
-import com.redhat.rhn.domain.rhnset.RhnSet;
-import com.redhat.rhn.domain.user.User;
-import com.redhat.rhn.frontend.action.systems.SystemListSetupAction;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
+import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
+import com.redhat.rhn.manager.system.SystemManager;
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 java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -34,36 +35,27 @@ import javax.servlet.http.HttpServletResponse;
* ListSystemsAction
* @version $Rev$
*/
-public class ListSystemsAction extends RhnAction {
+public class ListSystemsAction extends RhnAction implements Listable {
+
/**
- *
- * {@inheritDoc}
+ * ${@inheritDoc}
*/
public ActionForward execute(ActionMapping mapping,
ActionForm formIn,
HttpServletRequest request,
HttpServletResponse response) {
- RequestContext context = new RequestContext(request);
-
- RequestContext rctx = new RequestContext(request);
- User user = rctx.getLoggedInUser();
-
- if (context.wasDispatched("ssm.list.systems.confirmbutton")) {
- RhnSet set = RhnSetDecl.SYSTEMS.get(context.getLoggedInUser());
-
- DynaActionForm daForm = (DynaActionForm)formIn;
-
- // Logic to remove hosts from SSM goes here
-
- return mapping.findForward("confirm");
- }
-
- new SystemListSetupAction().execute(mapping, formIn, request, response);
-// ListHelper helper = new ListHelper(this, request);
-// helper.setListName("systemList");
-// helper.setDataSetName("pageList");
-// helper.execute();
-
+ ListHelper helper = new ListHelper(this, request);
+ helper.setListName("systemList");
+ helper.setDataSetName("pageList");
+ helper.execute();
return mapping.findForward("default");
}
+
+ /**
+ * ${@inheritDoc}
+ */
+ public List getResult(RequestContext context) {
+ return SystemManager.inSet(context.getLoggedInUser(),
+ RhnSetDecl.SYSTEMS.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 e3c1daa..6ea95ed 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
@@ -5489,7 +5489,7 @@ value for this entitlement, excluding the default organization's
consumption.</s
<source>Selected Systems List</source>
</trans-unit>
<trans-unit id="ssm.list.systems.summary">
- <source><p>Below are your selected systems. All actions
taken within this interface will apply only to the relevant systems in this
set.</p><p>To remove systems from the current set, un-check
those systems to be removed.</p></source>
+ <source><p>Below are your selected systems. All actions
taken within this interface will apply only to the these
systems.</p></source>
</trans-unit>
</group>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/list.jsp
b/java/code/webapp/WEB-INF/pages/ssm/systems/list.jsp
index c2cfef6..44e6651 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/list.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/list.jsp
@@ -12,12 +12,9 @@
<bean:message key="ssm.list.systems.header" />
</h2>
<p><bean:message key="ssm.list.systems.summary" /></p>
-<%--
<c:set var="notSelectable" value="true"/>
<c:set var="showLastCheckin" value="true"/>
-<c:set var="noPackages" value="true"/>
-<c:set var="noErrata" value="true"/>
---%>
+<c:set var="noUpdates" value="true"/>
<rl:listset name="systemListSet" legend="system">
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf" %>