java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDetailsAction.java |
3 -
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml |
12 ++++-
java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp |
22 ++++------
3 files changed, 21 insertions(+), 16 deletions(-)
New commits:
commit d7de457c2d459c2a42ab201c31d2a44f30060156
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Wed May 26 15:14:01 2010 -0400
RepoEdit page cleanup, jsp fixes
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 66eabba..1c10245 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
@@ -128,8 +128,7 @@ public class RepoDetailsAction extends RhnAction {
form.set(LABEL, repo.getLabel());
form.set(OLD_LABEL, repo.getLabel());
form.set(URL, repo.getSourceUrl());
- bindRepo(request, repo);
- request.setAttribute(ORG, repo.getOrg());
+ bindRepo(request, repo);
}
/**
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 d3f6d7a..ef9e26f 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
@@ -9244,6 +9244,12 @@ Please note that some manual configuration of these scripts may
still be require
<context
context-type="sourcefile">/rhn/channel/manage/repo/RepoList.do</context>
</context-group>
</trans-unit>
+ <trans-unit id="toolbar.delete.repos">
+ <source>delete repository</source>
+ <context-group name="ctx">
+ <context
context-type="sourcefile">/rhn/channel/manage/repo/RepoDetails.do</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="repos.jsp.toolbar">
<source>Create New Repository</source>
</trans-unit>
@@ -9260,12 +9266,14 @@ Please note that some manual configuration of these scripts may
still be require
<source>Create Repository</source>
</trans-unit>
<trans-unit id="repos.jsp.update.submit">
- <source>Create Repository</source>
+ <source>Update Repository</source>
</trans-unit>
<trans-unit id="repos.jsp.create.success">
<source>Repository created successfully</source>
</trans-unit>
-
+ <trans-unit id="repos.jsp.details.header2">
+ <source>Repository Details</source>
+ </trans-unit>
<!-- TNC -->
<trans-unit id="tnc.jsp.tnc">
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp
b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp
index 69362bf..2ea3d21 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repodetails.jsp
@@ -7,22 +7,21 @@
<body>
<c:choose>
<c:when test = "${not empty requestScope.create_mode}">
-<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
imgAlt="info.alt.img">
- <bean:message key="repos.jsp.toolbar"/>
-</rhn:toolbar>
-<h2><bean:message key="repos.jsp.header2"/></h2>
+ <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
imgAlt="info.alt.img">
+ <bean:message key="repos.jsp.toolbar"/>
+ </rhn:toolbar>
+ <h2><bean:message key="repos.jsp.header2"/></h2>
</c:when>
<c:otherwise>
-<rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
imgAlt="info.alt.img"
-
deletionUrl="RepoDelete.do?label=${contentSourceForm.map.label}"
- deletionType="snippets">
- <c:out value="${requestScope.snippet.displayName}"/>
-</rhn:toolbar>
-<h2><bean:message key="snippetdetails.jsp.header2"/></h2>
+ <rhn:toolbar base="h1" img="/img/rhn-icon-info.gif"
imgAlt="info.alt.img"
+ deletionUrl="RepoDelete.do?id=${requestScope.repo.id}"
+ deletionType="repos">
+ <c:out value="${requestScope.repo.label}"/>
+ </rhn:toolbar>
+ <h2><bean:message
key="repos.jsp.details.header2"/></h2>
</c:otherwise>
</c:choose>
-
<c:choose>
<c:when test="${empty requestScope.create_mode}">
<c:set var="url" value ="/channels/manage/repos/RepoEdit"/>
@@ -32,7 +31,6 @@
</c:otherwise>
</c:choose>
-
<div>
<html:form action="${url}">
<rhn:submitted/>
Show replies by date