From shughes at fedoraproject.org Thu Aug 20 12:01:31 2015 Content-Type: multipart/mixed; boundary="===============3350086426727496913==" MIME-Version: 1.0 From: Shannon Hughes To: spacewalk-commits at lists.fedorahosted.org Subject: Branch 'yum-repo-sync' - java/code Date: Wed, 02 Jun 2010 19:29:44 +0000 Message-ID: <20100602192944.A7B251201E0@lists.fedorahosted.org> --===============3350086426727496913== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/channel/manage/RepositoriesAc= tion.java | 11 + java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp = | 60 ++++++++++ java/code/webapp/WEB-INF/struts-config.xml = | 2 = 3 files changed, 69 insertions(+), 4 deletions(-) New commits: commit 38787659c4ba9b0b819025dad2994c9c36eec827 Author: Shannon Hughes Date: Wed Jun 2 15:28:08 2010 -0400 initial jsp support for channel to repo mapping diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/Re= positoriesAction.java b/java/code/src/com/redhat/rhn/frontend/action/channe= l/manage/RepositoriesAction.java index cb76c65..72c8dc2 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/Repositor= iesAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/Repositor= iesAction.java @@ -14,8 +14,10 @@ */ package com.redhat.rhn.frontend.action.channel.manage; = +import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; = import javax.servlet.http.HttpServletRequest; @@ -42,9 +44,13 @@ public class RepositoriesAction extends RhnAction implem= ents Listable { HttpServletRequest request, HttpServletResponse response) { = - ListSessionSetHelper helper =3D new ListSessionSetHelper(this,= request); - = RequestContext context =3D new RequestContext(request); + = + Map params =3D new HashMap(); = + params.put(RequestContext.CID, context.getRequiredParamAsStrin= g(RequestContext.CID)); + + ListSessionSetHelper helper =3D new ListSessionSetHelper(this,= request); + = if (!context.isSubmitted()) { List result =3D getResult(context); Set preSelect =3D new HashSet(); @@ -56,7 +62,6 @@ public class RepositoriesAction extends RhnAction impleme= nts Listable { = helper.execute(); if(helper.isDispatched()) { - //handle the dispatch action (like removing groups etc) return mapping.findForward("success"); } = = diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp= b/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp new file mode 100644 index 0000000..e206a1c --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp @@ -0,0 +1,60 @@ +<%@ taglib uri=3D"http://rhn.redhat.com/rhn" prefix=3D"rhn" %> +<%@ taglib uri=3D"http://java.sun.com/jsp/jstl/core" prefix=3D"c" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-html" prefix=3D"ht= ml" %> +<%@ taglib uri=3D"http://jakarta.apache.org/struts/tags-bean" prefix=3D"be= an" %> +<%@ taglib uri=3D"http://rhn.redhat.com/tags/list" prefix=3D"rl" %> + + + + + + + + +<%@ include file=3D"/WEB-INF/pages/common/fragments/channel/manage/manage_= channel_header.jspf" %> +
+ +

+ + + + + + + + + + + + + + + + ${current.label} + + + + + +
+
+ " /> +
+ + + +
+ + + \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/= WEB-INF/struts-config.xml index 3de4e99..63119e7 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -6484,7 +6484,7 @@ scope=3D"request" type=3D"com.redhat.rhn.frontend.action.channel.manage.Repositories= Action" className=3D"com.redhat.rhn.frontend.struts.RhnActionMapping"> - + = --===============3350086426727496913==--