java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDetailsAction.java |
21 +++------
java/code/src/com/redhat/rhn/manager/channel/repo/CreateRepoCommand.java |
22 +++++++++-
2 files changed, 29 insertions(+), 14 deletions(-)
New commits:
commit 623a75b26703a258e7dceb8240560ae3f4f09240
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Wed May 19 14:36:09 2010 -0400
adding repo domain creation logic to manager/action layer
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 57fadd9..4f7764f 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
@@ -29,10 +29,12 @@ 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.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;
/**
@@ -133,21 +135,14 @@ public class RepoDetailsAction extends RhnAction {
private ContentSource submit(HttpServletRequest request, DynaActionForm form) {
RequestContext context = new RequestContext(request);
-
String label = isCreateMode(request) ?
form.getString(LABEL) : form.getString(OLD_LABEL);
+ String url = form.getString(URL);
+ Org org = context.getLoggedInUser().getOrg();
- /*
- CobblerSnippet snip = CobblerSnippet.createOrUpdate(
- isCreateMode(request),
- name,
- form.getString(CONTENTS),
- context.getLoggedInUser().getOrg());
- if (!isCreateMode(request) &&
- !form.getString(NAME).equals(form.getString(OLD_NAME))) {
- snip.rename(form.getString(NAME));
- }
- */
- return null;
+ CreateRepoCommand repoCmd = new CreateRepoCommand(label, url, org);
+ repoCmd.store();
+
+ return repoCmd.getNewRepo();
}
}
diff --git a/java/code/src/com/redhat/rhn/manager/channel/repo/CreateRepoCommand.java
b/java/code/src/com/redhat/rhn/manager/channel/repo/CreateRepoCommand.java
index adec5e4..f9c1c73 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/repo/CreateRepoCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/repo/CreateRepoCommand.java
@@ -22,6 +22,7 @@ import org.apache.log4j.Logger;
import com.redhat.rhn.common.validator.ValidatorError;
import com.redhat.rhn.domain.channel.ChannelFactory;
import com.redhat.rhn.domain.channel.ContentSource;
+import
com.redhat.rhn.domain.org.Org;
/**
* CreateRepoCommand - Command to create a repo
@@ -31,6 +32,7 @@ public class CreateRepoCommand {
private String label;
private String url;
+ private Org org;
private ContentSource newRepo;
private List<ValidatorError> errors;
@@ -43,13 +45,30 @@ public class CreateRepoCommand {
* @param passwordIn to set for first user
* @param emailIn to set for first user
*/
- public CreateRepoCommand(String labelIn, String urlIn) {
+ public CreateRepoCommand(String labelIn, String urlIn, Org orgIn) {
this.label = labelIn;
this.url = urlIn;
+
this.org = orgIn;
}
/**
*
+ * @return Org of repo
+ */
+ public Org getOrg() {
+ return org;
+ }
+
+ /**
+ *
+ * @param org to set for repo
+ */
+ public void setOrg(Org org) {
+
this.org = org;
+ }
+
+ /**
+ *
* @return label for repo
*/
public String getLabel() {
@@ -94,6 +113,7 @@ public class CreateRepoCommand {
ContentSource repo = ChannelFactory.createRepo();
repo.setLabel(this.label);
repo.setSourceUrl(this.url);
+ repo.setOrg(this.org);
ChannelFactory.save(repo);
this.newRepo = repo;
}