java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java |
2
java/code/src/com/redhat/rhn/domain/channel/ContentSource.hbm.xml |
2
java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDetailsAction.java |
25 ++--------
3 files changed, 9 insertions(+), 20 deletions(-)
New commits:
commit 9ea8d30a5348bbd8d81900b88c06adca7ba03c26
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Wed May 26 14:38:00 2010 -0400
fix hibernate content obj named queries for Edit Repo
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 d8cc1ae..9e781cf 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
@@ -141,7 +141,7 @@ public class ChannelFactory extends HibernateFactory {
public static ContentSource lookupContentSource(Long id, Org orgIn) {
Map params = new HashMap();
params.put("id", id);
- params.put("org", orgIn.getId());
+ params.put("org", orgIn);
return (ContentSource) singleton.lookupObjectByNamedQuery(
"ContentSource.findByIdandOrg", params);
}
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ContentSource.hbm.xml
b/java/code/src/com/redhat/rhn/domain/channel/ContentSource.hbm.xml
index f904c2a..4640978 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ContentSource.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/channel/ContentSource.hbm.xml
@@ -39,7 +39,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<query name="ContentSource.findByIdandOrg">
- <![CDATA[from com.redhat.rhn.domain.channel.ContentSource as c where c.id =
:id and c.org_id = :org]]>
+ <![CDATA[from com.redhat.rhn.domain.channel.ContentSource as c where c.id =
:id and c.org = :org]]>
</query>
<query name="ContentSource.findById">
<![CDATA[from com.redhat.rhn.domain.channel.ContentSource as c where c.id =
:id]]>
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDetailsAction.java
b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDetailsAction.java
index 579d49e..66eabba 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDetailsAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDetailsAction.java
@@ -20,7 +20,6 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
@@ -29,13 +28,13 @@ import org.apache.struts.action.DynaActionForm;
import com.redhat.rhn.common.validator.ValidatorException;
import com.redhat.rhn.common.validator.ValidatorResult;
import com.redhat.rhn.domain.channel.ContentSource;
-import com.redhat.rhn.domain.kickstart.cobbler.CobblerSnippet;
import
com.redhat.rhn.domain.org.Org;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnValidationHelper;
import com.redhat.rhn.manager.channel.repo.CreateRepoCommand;
+import com.redhat.rhn.manager.channel.repo.EditRepoCommand;
/**
@@ -97,7 +96,7 @@ public class RepoDetailsAction extends RhnAction {
}
}
else if(!isCreateMode(request)) {
-
+ setup(request, form);
}
// setup(request, form);
@@ -115,24 +114,14 @@ public class RepoDetailsAction extends RhnAction {
private boolean isCreateMode(HttpServletRequest request) {
return Boolean.TRUE.equals(request.getAttribute(CREATE_MODE));
}
- /*
+
private void setup(HttpServletRequest request, DynaActionForm form) {
RequestContext context = new RequestContext(request);
- if (isCreateMode(request)) {
- request.setAttribute(PREFIX, CobblerSnippet.getPrefixFor(
- context.getLoggedInUser().getOrg()));
- }
- else {
- String param = NAME;
- if (!isCreateMode(request) && RhnValidationHelper.
- getFailedValidation(request)) {
- param = OLD_NAME;
- }
- CobblerSnippet snip = loadEditableSnippet(request, param);
- setupSnippet(request, form, snip);
- }
+ EditRepoCommand cmd = new EditRepoCommand(context.getLoggedInUser(),
+ context.getParamAsLong("id"));
+ setupRepo(request, form, cmd.getNewRepo());
}
- */
+
private void setupRepo(HttpServletRequest request, DynaActionForm form,
ContentSource repo) {