java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java |
7 +------
java/code/src/com/redhat/rhn/manager/channel/test/CreateCommandTest.java |
2 +-
2 files changed, 2 insertions(+), 7 deletions(-)
New commits:
commit 93d09aa0f827faf2c6a93a8109c1ef2cdebc2deb
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Feb 21 18:09:50 2011 +0100
removing dead code
selectedVersionStr is always not null at this point
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java
b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java
index a0f621c..7e7deb0 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java
@@ -169,10 +169,6 @@ public class AddRedHatErrataAction extends RhnListAction {
sortChannelsAndChildify(channelSet, channelList, user,
selectedChannelStr);
request.setAttribute(CHANNEL_LIST, channelList);
}
- if (channelList.size() > 0 && selectedVersionStr == null) {
- selectedChannelStr = channelList.get(0).getId().toString();
- }
-
}
commit 39352f14fb1c41c3bdc8b7a2023c0eae9db10e62
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Feb 21 18:08:54 2011 +0100
selectedChannel is always null at this place
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java
b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java
index 140fa73..a0f621c 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java
@@ -137,8 +137,7 @@ public class AddRedHatErrataAction extends RhnListAction {
//If this is a clone, go ahead and pre-select the original Channel
Channel original = ChannelFactory.lookupOriginalChannel(currentChan);
- if (!requestContext.isSubmitted() && selectedChannel == null &&
- original != null) {
+ if (!requestContext.isSubmitted() && original != null) {
selectedChannel = original;
selectedChannelStr = selectedChannel.getId().toString();
String tmp = findVersionFromChannel(selectedChannel);
commit 5f639d6df1d18db406d16990ebf14f3c0d1530ae
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Feb 21 18:21:13 2011 +0100
fix CreateCommandTest.testVerifyChannelName test
diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/CreateCommandTest.java
b/java/code/src/com/redhat/rhn/manager/channel/test/CreateCommandTest.java
index 472a2f7..93df83d 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/test/CreateCommandTest.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/test/CreateCommandTest.java
@@ -64,6 +64,7 @@ public class CreateCommandTest extends RhnBaseTestCase {
invalidChannelName("rhn-channel-name");
invalidChannelName("redhat linux");
invalidChannelName("Red Hat Enterprise Spacewalk Sync");
+ invalidChannelName("0longerthansix");
// V A L I D
@@ -75,7 +76,6 @@ public class CreateCommandTest extends RhnBaseTestCase {
validChannelName("bin/channel/ok");
validChannelName("abc 123-foo/bar_under.ALPHA");
validChannelName("Jesusrs API Test Channel");
- validChannelName("0longerthansix");
// we allow the following characters but don't advertise them
// ' ( )
Show replies by date