java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 5 ++- java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncRepositoriesAction.java | 4 -- java/code/src/com/redhat/rhn/frontend/dto/ContentSourceDto.java | 16 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 7 ++++ java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp | 7 ++++ 5 files changed, 35 insertions(+), 4 deletions(-)
New commits: commit 0806217702dd4f98dd3f0dc69c39e484a7ddc8b1 Author: Shannon Hughes shughes@redhat.com Date: Tue Jun 8 16:23:06 2010 -0400
add channel count access for repo objects
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml index 2820086..c2f6b4b 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml @@ -1033,7 +1033,10 @@ SELECT CP.package_id, CP.name_id, CP.evr_id, CP.package_arch_id
<mode name="contentsrc_for_org" class="com.redhat.rhn.frontend.dto.ContentSourceDto"> <query params="org_id"> - SELECT CS.id, CS.label + SELECT CS.id, CS.label, + (SELECT count(ccs.channel_id) + FROM rhnChannelContentSource ccs + WHERE ccs.source_id = CS.id) as channels FROM rhnContentSource CS WHERE CS.org_id = :org_id </query> diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncRepositoriesAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncRepositoriesAction.java index c0e374a..675d393 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncRepositoriesAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncRepositoriesAction.java @@ -15,7 +15,6 @@ 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; @@ -57,8 +56,7 @@ public class SyncRepositoriesAction extends RhnAction implements Listable { params.put(RequestContext.CID, chan.getId().toString());
ListSessionSetHelper helper = new ListSessionSetHelper(this, request,params); - - //helper.ignoreEmptySelection(); + helper.execute();
if(helper.isDispatched()) { diff --git a/java/code/src/com/redhat/rhn/frontend/dto/ContentSourceDto.java b/java/code/src/com/redhat/rhn/frontend/dto/ContentSourceDto.java index 0dd693e..293df08 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/ContentSourceDto.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/ContentSourceDto.java @@ -22,6 +22,7 @@ package com.redhat.rhn.frontend.dto; public class ContentSourceDto extends BaseDto {
private Long id; + private Long channels; private String label;
/** @@ -52,6 +53,21 @@ public class ContentSourceDto extends BaseDto { public void setLabel(String labelIn) { this.label = labelIn; } + + /** + * {@inheritDoc} + */ + public Long getChannels() { + return channels; + } + + /** + * @param idIn The id to set. + */ + public void setChannels(Long cIn) { + this.channels = cIn; + } +
} 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 d196c63..3c6bdba 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 @@ -6617,6 +6617,13 @@ value for this entitlement, excluding the default organization's consumption.</s </context-group> </trans-unit>
+ <trans-unit id="repo.jsp.channels"> +<source>Channels</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/channels/manage/repos/RepoList</context> + </context-group> + </trans-unit> + <trans-unit id="download.jsp.package"> <source>Package</source> <context-group name="ctx"> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp index 9657baa..761c576 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp @@ -39,6 +39,13 @@ filterattr="label"> <c:out value="<a href="/rhn/channels/manage/repos/RepoEdit.do?id=${current.id}">${current.label}</a>" escapeXml="false" /> </rl:column> + <rl:column bound="false" + sortable="false" + headerkey="repo.jsp.channels" + attr="channels" + styleclass="last-column"> + <c:out value="${current.channels}" /> + </rl:column> </rl:list> </rl:listset>
spacewalk-commits@lists.fedorahosted.org