java/code/src/com/redhat/rhn/frontend/action/channel/manage/RepositoriesAction.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 <shughes(a)redhat.com>
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/RepositoriesAction.java
b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/RepositoriesAction.java
index cb76c65..72c8dc2 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/RepositoriesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/RepositoriesAction.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 implements Listable
{
HttpServletRequest request,
HttpServletResponse response) {
- ListSessionSetHelper helper = new ListSessionSetHelper(this, request);
-
RequestContext context = new RequestContext(request);
+
+ Map params = new HashMap();
+ params.put(RequestContext.CID,
context.getRequiredParamAsString(RequestContext.CID));
+
+ ListSessionSetHelper helper = new ListSessionSetHelper(this, request);
+
if (!context.isSubmitted()) {
List<ContentSource> result = getResult(context);
Set<String> preSelect = new HashSet<String>();
@@ -56,7 +62,6 @@ public class RepositoriesAction extends RhnAction implements 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="http://rhn.redhat.com/rhn" prefix="rhn" %>
+<%@ taglib
uri="http://java.sun.com/jsp/jstl/core" prefix="c"
%>
+<%@ taglib
uri="http://jakarta.apache.org/struts/tags-html"
prefix="html" %>
+<%@ taglib
uri="http://jakarta.apache.org/struts/tags-bean"
prefix="bean" %>
+<%@ taglib
uri="http://rhn.redhat.com/tags/list" prefix="rl"
%>
+
+<html:xhtml/>
+<html>
+<head>
+ <meta name="page-decorator" content="none" />
+</head>
+<body>
+
+<%@ include
file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf"
%>
+<BR>
+
+<h2><img src="/img/rhn-icon-packages.gif"> <bean:message
key="channel.jsp.package.list"/></h2>
+
+
+
+<rl:listset name="packageSet" legend="system-group">
+
+<input type="hidden" name="cid" value="${cid}" />
+
+ <rl:list
+ decorator="SelectableDecorator"
+ emptykey="package.jsp.emptylist"
+ alphabarcolumn="label"
+ >
+
+ <rl:decorator name="PageSizeDecorator"/>
+
+ <rl:selectablecolumn value="${current.id}"
+ styleclass="first-column"/>
+
+ <rl:column sortable="true"
+ bound="false"
+ headerkey="download.jsp.package"
+ sortattr="label"
+ defaultsort="asc"
+ >
+
+ <a
href="/rhn/software/packages/Details.do?pid=${current.id}">${current.label}</a>
+ </rl:column>
+
+
+
+ </rl:list>
+ <div align="right">
+ <hr />
+ <input type="submit" name="confirm"
+ value="<bean:message
key="channel.jsp.package.removebutton"/>" />
+ </div>
+ <rhn:submitted/>
+
+
+</rl:listset>
+
+</body>
+</html>
\ 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="request"
type="com.redhat.rhn.frontend.action.channel.manage.RepositoriesAction"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
- <forward name="default"
path="/WEB-INF/pages/channel/manage/repositories.jsp" />
+ <forward name="default"
path="/WEB-INF/pages/channel/manage/channelrepos.jsp" />
<forward name="success"
path="/channels/manage/Repositories.do" redirect="true" />
</action>