java/code/src/com/redhat/rhn/frontend/action/channel/manage/RepositoriesAction.java |
13 ++++++++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml |
9 ++++++
java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp |
10 +++----
3 files changed, 25 insertions(+), 7 deletions(-)
New commits:
commit d88273466f3d28f1cd5dc5240c7fdb5dbc771d2f
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Wed Jun 2 16:05:59 2010 -0400
preselect set channel repo logic
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 72c8dc2..1424a65 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
@@ -27,6 +27,7 @@ import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.channel.ChannelFactory;
import com.redhat.rhn.domain.channel.ContentSource;
import com.redhat.rhn.domain.user.User;
@@ -45,17 +46,25 @@ public class RepositoriesAction extends RhnAction implements Listable
{
HttpServletResponse response) {
RequestContext context = new RequestContext(request);
+ User user = context.getLoggedInUser();
+
+ long cid = context.getRequiredParam("cid");
+ Channel chan = ChannelFactory.lookupByIdAndUser(cid, user);
+ request.setAttribute("channel_name", chan.getName());
Map params = new HashMap();
params.put(RequestContext.CID,
context.getRequiredParamAsString(RequestContext.CID));
- ListSessionSetHelper helper = new ListSessionSetHelper(this, request);
+ ListSessionSetHelper helper = new ListSessionSetHelper(this, request,
params);
if (!context.isSubmitted()) {
List<ContentSource> result = getResult(context);
Set<String> preSelect = new HashSet<String>();
for (int i = 0; i < result.size(); i++) {
- preSelect.add(result.get(i).getId().toString());
+ ContentSource src = result.get(i);
+ if(src.getChannels().contains(chan)) {
+ preSelect.add(src.getId().toString());
+ }
}
helper.preSelect(preSelect);
}
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 ca2bf4e..d9ed732 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
@@ -9298,6 +9298,15 @@ Please note that some manual configuration of these scripts may
still be require
<trans-unit id="repos.jsp.delete.info.header">
<source>Repository Information</source>
</trans-unit>
+ <trans-unit id="repos.jsp.update.channel">
+ <source>Update Repositories</source>
+ </trans-unit>
+ <trans-unit id="repos.jsp.channel.header">
+ <source>Repository</source>
+ </trans-unit>
+ <trans-unit id="repos.jsp.channel.repos">
+ <source>Channel Repositories</source>
+ </trans-unit>
<!-- TNC -->
<trans-unit id="tnc.jsp.tnc">
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp
b/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp
index e206a1c..fdbc919 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/channelrepos.jsp
@@ -14,7 +14,7 @@
<%@ 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>
+<h2><img src="/img/rhn-icon-packages.gif"> <bean:message
key="repos.jsp.channel.repos"/></h2>
@@ -24,7 +24,7 @@
<rl:list
decorator="SelectableDecorator"
- emptykey="package.jsp.emptylist"
+ emptykey="repos.jsp.norepos"
alphabarcolumn="label"
@@ -35,12 +35,12 @@
<rl:column sortable="true"
bound="false"
- headerkey="download.jsp.package"
+ headerkey="repos.jsp.channel.header"
sortattr="label"
defaultsort="asc"
- <a
href="/rhn/software/packages/Details.do?pid=${current.id}">${current.label}</a>
+ <a
href="/rhn/channels/manage/repos/RepoEdit.do?id=${current.id}">${current.label}</a>
</rl:column>
@@ -49,7 +49,7 @@
<div align="right">
<hr />
<input type="submit" name="confirm"
- value="<bean:message
key="channel.jsp.package.removebutton"/>" />
+ value="<bean:message key="repos.jsp.update.channel"/>"
/>
</div>
<rhn:submitted/>