java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncRepositoriesAction.java |
29 ++++------
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml |
2
java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java |
2
java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp |
4 -
4 files changed, 16 insertions(+), 21 deletions(-)
New commits:
commit 08f471eb64a6ce78302e4e216acefe7c4b00a31f
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Wed Jun 23 16:59:24 2010 -0400
hook to call create repo sync task in taskomatic
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 752919e..e1246a3 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
@@ -17,7 +17,6 @@ package com.redhat.rhn.frontend.action.channel.manage;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -29,12 +28,14 @@ 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.task.TaskFactory;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
-import com.redhat.rhn.frontend.taglibs.list.helper.ListSessionSetHelper;
+import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
+import com.redhat.rhn.taskomatic.task.RepoSyncTask;
/**
*
@@ -61,21 +62,19 @@ public class SyncRepositoriesAction extends RhnAction implements
Listable {
Map params = new HashMap();
params.put(RequestContext.CID, chan.getId().toString());
- ListSessionSetHelper helper = new ListSessionSetHelper(this, request, params);
-
- helper.execute();
-
- if (helper.isDispatched()) {
- Set <String> set = helper.getSet();
- for (String id : set) {
- Long sgid = Long.valueOf(id);
- ContentSource tmp = ChannelFactory.lookupContentSource(sgid);
- System.out.println("SYNCING:" + tmp.getSourceUrl());
- }
+
+ ListHelper helper = new ListHelper(this, request, params);
+
+ helper.execute();
+
+ if (context.isSubmitted()) {
+
+ TaskFactory.createTask(user.getOrg(),
+ RepoSyncTask.DISPLAY_NAME, chan.getId());
StrutsDelegate strutsDelegate = getStrutsDelegate();
- strutsDelegate.saveMessage("channel.edit.repo.updated",
- new String[] {chan.getName()}, request);
+ createSuccessMessage(request, "message.syncscheduled",
+ chan.getName());
return strutsDelegate.forwardParams
(mapping.findForward("success"), params);
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index e7e55bc..5bf9041 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -8417,7 +8417,7 @@ Follow this url to see the full list of inactive systems:
<source>Channel <strong>{0}</strong>
updated.</source>
</trans-unit>
<trans-unit id="message.syncscheduled">
- <source>Repository Sync Scheduled.</source>
+ <source>Repository sync scheduled for {0}.</source>
</trans-unit>
<trans-unit id="message.channelsubscribers">
<source>Per-User subscription restrictions may be applied in the
Subscribers tab</source>
diff --git a/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java
b/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java
index abd6936..499eb7e 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java
@@ -17,12 +17,10 @@ package com.redhat.rhn.manager.channel;
import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.channel.ChannelFactory;
-import com.redhat.rhn.domain.task.TaskFactory;
import com.redhat.rhn.domain.common.ChecksumType;
import com.redhat.rhn.frontend.xmlrpc.InvalidChannelLabelException;
import com.redhat.rhn.frontend.xmlrpc.InvalidChannelNameException;
import com.redhat.rhn.frontend.xmlrpc.InvalidParentChannelException;
-import com.redhat.rhn.taskomatic.task.RepoSyncTask;
/**
* UpdateChannelCommand - command to create a new channel.
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp
b/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp
index a96bb4e..4836de1 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/syncrepos.jsp
@@ -21,21 +21,19 @@
<input type="hidden" name="cid" value="${cid}" />
<rl:list
- decorator="SelectableDecorator"
emptykey="repos.jsp.norepos"
alphabarcolumn="label"
<rl:decorator name="PageSizeDecorator"/>
- <rl:selectablecolumn value="${current.id}"
- styleclass="first-column"/>
<rl:column sortable="true"
bound="false"
headerkey="repos.jsp.channel.header"
sortattr="label"
defaultsort="asc"
+ styleclass="first-column last-column"
<a
href="/rhn/channels/manage/repos/RepoEdit.do?id=${current.id}">${current.label}</a>