java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDetailsAction.java |
6 +++---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml |
9 +++------
java/code/src/com/redhat/rhn/manager/channel/repo/CreateRepoCommand.java |
3 ++-
java/code/webapp/WEB-INF/struts-config.xml |
5 ++---
4 files changed, 10 insertions(+), 13 deletions(-)
New commits:
commit f63b3bf7b9be64b8764ad2ca8d9f80700496cd9b
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Mon May 24 17:02:12 2010 -0400
ise fixes for repo create
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 4f7764f..ff15cbf 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
@@ -49,7 +49,7 @@ public class RepoDetailsAction extends RhnAction {
public static final String REPO = "repo";
public static final String URL = "url";
public static final String LABEL = "label";
- public static final String OLD_LABEL = "old_label";
+ public static final String OLD_LABEL = "oldLabel";
private static final String VALIDATION_XSD =
"/com/redhat/rhn/frontend/action/channel/" +
@@ -79,11 +79,11 @@ public class RepoDetailsAction extends RhnAction {
ContentSource repo = submit(request, form);
if (isCreateMode(request)) {
createSuccessMessage(request,
- "repo.create.success", repo.getLabel());
+ "repos.jsp.create.success", repo.getLabel());
}
else {
createSuccessMessage(request,
- "repo.update.success", repo.getLabel());
+ "repos.jsp.update.success", repo.getLabel());
}
request.removeAttribute(CREATE_MODE);
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 b8ce58d..d3f6d7a 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
@@ -9223,9 +9223,6 @@ Please note that some manual configuration of these scripts may
still be require
</group>
<!-- Repo Sync -->
- <trans-unit id="repos.jsp.toolbar">
- <source>Repository</source>
- </trans-unit>
<trans-unit id="repos.jsp.summary">
<source>Summary for repos here</source>
</trans-unit>
@@ -9253,9 +9250,6 @@ Please note that some manual configuration of these scripts may
still be require
<trans-unit id="repos.jsp.header2">
<source>Create Repository</source>
</trans-unit>
- <trans-unit id="repos.jsp.header2">
- <source>Create Repository</source>
- </trans-unit>
<trans-unit id="repos.jsp.create.label">
<source>Repository Label</source>
</trans-unit>
@@ -9268,6 +9262,9 @@ Please note that some manual configuration of these scripts may
still be require
<trans-unit id="repos.jsp.update.submit">
<source>Create Repository</source>
</trans-unit>
+ <trans-unit id="repos.jsp.create.success">
+ <source>Repository created successfully</source>
+ </trans-unit>
<!-- TNC -->
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 f9c1c73..7b90c27 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
@@ -113,7 +113,8 @@ public class CreateRepoCommand {
ContentSource repo = ChannelFactory.createRepo();
repo.setLabel(this.label);
repo.setSourceUrl(this.url);
- repo.setOrg(this.org);
+ repo.setOrg(this.org);
+ repo.setType(ChannelFactory.CONTENT_SOURCE_TYPE_YUM);
ChannelFactory.save(repo);
this.newRepo = repo;
}
diff --git a/java/code/webapp/WEB-INF/struts-config.xml
b/java/code/webapp/WEB-INF/struts-config.xml
index a88818e..2d7bb87 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -821,6 +821,7 @@
<form-bean name="contentSourceForm"
type="com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm">
<form-property name="url"
type="java.lang.String"/>
+ <form-property name="oldLabel" type="java.lang.String"
/>
<form-property name="label"
type="java.lang.String"/>
</form-bean>
@@ -6618,11 +6619,10 @@
parameter="create_mode"
type="com.redhat.rhn.frontend.action.channel.manage.repo.RepoDetailsAction"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
- <set-property property="acls"
value="org_entitlement(rhn_provisioning); user_role(config_admin)"/>
<forward name="default"
path="/WEB-INF/pages/channel/manage/repo/repodetails.jsp"/>
<forward name="success"
- path="/channels/manage/repo/RepoEdit.do" redirect =
"true"
+ path="/channels/manage/repos/RepoEdit.do" redirect =
"true"
/>
</action>
@@ -6632,7 +6632,6 @@
parameter="edit_mode"
type="com.redhat.rhn.frontend.action.channel.manage.repo.RepoDetailsAction"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
- <set-property property="acls"
value="org_entitlement(rhn_provisioning); user_role(config_admin)"/>
<forward name="default"
path="/WEB-INF/pages/channel/manage/repo/repodetails.jsp"/>
<forward name="success"
Show replies by date