java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java |
8 ++++++++
java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDeleteAction.java |
3 ++-
java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp |
2 +-
3 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 303c83106485327979bb2fdaf82f6fb1203bb668
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Thu May 27 14:45:15 2010 -0400
logic to delete content sources from db
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
index 9e781cf..af58d33 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
@@ -210,6 +210,14 @@ public class ChannelFactory extends HibernateFactory {
public static void remove(DistChannelMap dcm) {
singleton.removeObject(dcm);
}
+
+ /**
+ * Remove a Content Source from the DB
+ * @param src to be removed from database
+ */
+ public static void remove(ContentSource src) {
+ singleton.removeObject(src);
+ }
/**
* Returns the base channel for the given server id.
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDeleteAction.java
b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDeleteAction.java
index c22f1af..9ce5da8 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDeleteAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDeleteAction.java
@@ -22,6 +22,7 @@ import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import com.redhat.rhn.common.validator.ValidatorException;
+import com.redhat.rhn.domain.channel.ChannelFactory;
import com.redhat.rhn.domain.channel.ContentSource;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
@@ -51,7 +52,7 @@ public class RepoDeleteAction extends RhnAction {
if (context.isSubmitted()) {
try {
- //delete here
+ ChannelFactory.remove(src);
createSuccessMessage(request,
"repos.delete.success", cmd.getLabel());
return mapping.findForward("success");
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp
b/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp
index 4e9c3d5..5d18327 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/repo/deleteconfirm.jsp
@@ -14,7 +14,7 @@
<p><bean:message key="repos.jsp.delete.summary"/></p>
<p><rhn:warning key= "repos.jsp.delete.warning"/></p>
<div>
- <form method="post"
action="/rhn/channels/cobbler/manage/repos/RepoDelete.do">
+ <form method="post"
action="/rhn/channels/manage/repos/RepoDelete.do">
<h2><bean:message key="repos.jsp.delete.info.header"/></h2>
<table class="details">
<tr>
Show replies by date