java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java | 10 +---------
java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf | 2 +-
java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp | 2 +-
3 files changed, 3 insertions(+), 11 deletions(-)
New commits:
commit 7199612c442c40fc67046895be6c175cc1a8b983
Author: Brad Buckingham <bbuckingham(a)redhat.com>
Date: Thu Jun 25 17:43:02 2009 -0400
508141 - ManageSoftwareChannels - fix broken links for 'delete software channel'
The delete_confirm.pxt has been ported to java; however, there were still
several pages pointing to it. Updated those.
Also found that the channel id (cid) was not being saved in the request for
ManageSoftwareChannels->channel->Packages; therefore, the delete link on that
page was missing the cid value. Updated that as well.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java
index 93a7c4d..54d782d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java
@@ -35,8 +35,6 @@ import javax.servlet.http.HttpServletResponse;
*/
public class ChannelPackageMenuAction extends RhnAction {
-
-
/** {@inheritDoc} */
public ActionForward execute(ActionMapping mapping,
ActionForm formIn,
@@ -46,7 +44,6 @@ public class ChannelPackageMenuAction extends RhnAction {
RequestContext requestContext = new RequestContext(request);
User user = requestContext.getLoggedInUser();
-
long cid = requestContext.getRequiredParam("cid");
Channel chan = ChannelFactory.lookupByIdAndUser(cid, user);
@@ -57,13 +54,8 @@ public class ChannelPackageMenuAction extends RhnAction {
request.setAttribute("channel_name", chan.getName());
request.setAttribute("channel", chan);
+ request.setAttribute("cid", cid);
return mapping.findForward("default");
-
}
-
-
-
-
-
}
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf
index 172aa7f..118367c 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf
@@ -1,7 +1,7 @@
<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif"
imgAlt="overview.jsp.alt"
helpUrl="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp#s2-sm-channel-manage"
- deletionUrl="/network/software/channels/manage/delete_confirm.pxt?cid=${cid}"
+ deletionUrl="/rhn/channels/manage/Delete.do?cid=${cid}"
deletionType="channel">
<bean:message key="channel.edit.jsp.toolbar" arg0="${channel_name}"/>
</rhn:toolbar>
diff --git a/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp b/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp
index bcba877..ae73eb3 100644
--- a/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp
+++ b/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp
@@ -16,7 +16,7 @@
</html:messages>
<rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif"
- deletionUrl="/network/software/channels/manage/delete_confirm.pxt?cid=${param.cid}"
+ deletionUrl="/rhn/channels/manage/Delete.do?cid=${param.cid}"
deletionAcl="user_role(channel_admin); formvar_exists(cid)"
deletionType="software.channel">
<bean:message key="channel.edit.jsp.toolbar" arg0="${channel_name}"/>