java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
| 1 +
java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeConfirm.java
| 7 ++++---
java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/UnsubscribeConfirmSubmitAction.java
| 8 +++++---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
| 2 +-
4 files changed, 11 insertions(+), 7 deletions(-)
New commits:
commit c425651c7fc1c91395edde5aa0519b959c468a50
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 28 18:02:51 2010 +0100
539159 - offering only ssm systems with appropriate permissions for config channel
unsubscription
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/UnsubscribeConfirmSubmitAction.java
b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/UnsubscribeConfirmSubmitAction.java
index fb89400..093fbcf 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/UnsubscribeConfirmSubmitAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/UnsubscribeConfirmSubmitAction.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.frontend.action.configuration.ssm;
+import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.common.hibernate.LookupException;
import com.redhat.rhn.domain.config.ConfigChannel;
import com.redhat.rhn.domain.rhnset.RhnSet;
@@ -21,6 +22,7 @@ import com.redhat.rhn.domain.rhnset.RhnSetElement;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.configuration.ConfigActionHelper;
+import com.redhat.rhn.frontend.dto.ConfigSystemDto;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnListDispatchAction;
import com.redhat.rhn.manager.configuration.ConfigurationManager;
@@ -72,15 +74,15 @@ public class UnsubscribeConfirmSubmitAction extends
RhnListDispatchAction {
public ActionForward confirm(ActionMapping mapping, ActionForm form,
HttpServletRequest request, HttpServletResponse response) {
User user = new RequestContext(request).getLoggedInUser();
- RhnSet systemSet = RhnSetDecl.SYSTEMS.get(user);
RhnSet channelSet = RhnSetDecl.CONFIG_CHANNELS.get(user);
ConfigurationManager cm = ConfigurationManager.getInstance();
+ DataResult systemSet = cm.ssmSystemListForChannels(user, null);
int successes = 0;
- Iterator systems = systemSet.getElements().iterator();
+ Iterator systems = systemSet.iterator();
//go through each system in the set
while (systems.hasNext()) {
- Long sid = ((RhnSetElement)systems.next()).getElement();
+ Long sid = ((ConfigSystemDto)systems.next()).getId();
Server server;
boolean hit = false;
try {
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 6db0cae..8cf1daf 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
@@ -15515,7 +15515,7 @@ any of these revisions. Are you sure you want to do
this?</source>
<source>You can unsubscribe systems from the configuration channels
below. The channels shown below are all of the global configuration channels to which at
least one system in your system set is subscribed.</source>
</trans-unit>
<trans-unit id="unsubscribe.jsp.noChannels">
- <source>No configuration channels.</source>
+ <source>No configuration channels with subscribed systems in the current
System Set!</source>
</trans-unit>
<trans-unit id="unsubscribe.jsp.systems">
<source>Systems</source>
commit fd4ef2d08d9dff304a778527a6b9cdada43c5812
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 28 17:06:31 2010 +0100
539159 - offering only ssm systems with appropriate permissions for config channel
subscription
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
index d2edaad..177f872 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
@@ -895,6 +895,7 @@ SELECT S.id, S.name
WHERE ST.label = :system_set_label
AND ST.user_id = :user_id
AND ST.element = S.id
+ AND EXISTS(SELECT 1 FROM rhnServerFeaturesView SFV WHERE SFV.server_id = ST.element
AND SFV.label = 'ftr_config')
ORDER BY S.name
</query>
<elaborator params="channel_set_label, user_id">
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeConfirm.java
b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeConfirm.java
index 73eceff..4536d1a 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeConfirm.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeConfirm.java
@@ -23,6 +23,7 @@ import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.common.BadParameterException;
import com.redhat.rhn.frontend.action.configuration.ConfigChannelSetComparator;
+import com.redhat.rhn.frontend.dto.ConfigSystemDto;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.frontend.struts.RhnHelper;
@@ -122,15 +123,15 @@ public class SubscribeConfirm extends RhnAction {
String position = request.getParameter(POSITION);
checkPosition(request);
- RhnSet systems = RhnSetDecl.SYSTEMS.get(user);
+ List systems = ConfigurationManager.getInstance().ssmSystemsForSubscribe(user);
RhnSet channels = RhnSetDecl.CONFIG_CHANNELS_RANKING.get(user);
//visit every server and change their subscriptions
//keep track of how many servers we have changed
int successes = 0;
- Iterator i = systems.getElements().iterator();
+ Iterator i = systems.iterator();
while (i.hasNext()) {
- Long sid = ((RhnSetElement)i.next()).getElement();
+ Long sid = ((ConfigSystemDto)i.next()).getId();
try {
Server server = SystemManager.lookupByIdAndUser(sid, user);
Show replies by date