java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEditAction.java |
41 ++++++----
java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp |
7 -
2 files changed, 29 insertions(+), 19 deletions(-)
New commits:
commit 9666fb3f37bf2361db12ea32e111deb64acab9e2
Author: Partha Aji <paji(a)redhat.com>
Date: Tue Jun 30 15:08:05 2009 -0400
508962 - Fixed KS software edit page to hide repo section if tree is not rhel 5
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEditAction.java
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEditAction.java
index aa2dc00..d69922b 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEditAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEditAction.java
@@ -71,7 +71,7 @@ public class KickstartSoftwareEditAction extends BaseKickstartEditAction
{
String fieldChanged = form.getString("fieldChanged");
KickstartEditCommand cmd = (KickstartEditCommand) cmdIn;
KickstartableTree tree =
cmd.getKickstartData().getKickstartDefaults().getKstree();
- KickstartHelper kshelper = new KickstartHelper(ctx.getRequest());
+ KickstartableTree selectedTree;
List trees = null;
Long incomingChannelId = (Long) form.get(CHANNEL);
Long channelId = incomingChannelId;
@@ -88,6 +88,7 @@ public class KickstartSoftwareEditAction extends BaseKickstartEditAction
{
ctx.getCurrentUser().getOrg());
}
setupUrl(ctx, form, kstree);
+ selectedTree = kstree;
}
else {
if (form.get(CHANNEL) != null) {
@@ -104,12 +105,14 @@ public class KickstartSoftwareEditAction extends
BaseKickstartEditAction {
ctx.getCurrentUser().getOrg());
}
setupUrl(ctx, form, kstree);
+ selectedTree = kstree;
}
if (fieldChanged.equals("kstree")) {
KickstartableTree kstree =
KickstartFactory.lookupKickstartTreeByIdAndOrg((Long) form.get(TREE),
ctx.getCurrentUser().getOrg());
setupUrl(ctx, form, kstree);
+ selectedTree = kstree;
}
ctx.getRequest().setAttribute(TREES, trees);
if (trees == null || trees.size() == 0) {
@@ -143,7 +146,7 @@ public class KickstartSoftwareEditAction extends
BaseKickstartEditAction {
if (form.getString(URL) == null) {
ctx.getRequest().setAttribute("nourl", "true");
}
- setupRepos(ctx, form, cmd.getKickstartData());
+ setupRepos(ctx, form, cmd.getKickstartData(), selectedTree);
}
private void setupChildChannels(RequestContext ctx, Long channelId,
@@ -244,21 +247,27 @@ public class KickstartSoftwareEditAction extends
BaseKickstartEditAction {
}
private void setupRepos(RequestContext context,
- DynaActionForm form, KickstartData ksdata) {
- List <LabelValueEnabledBean> repos = new
LinkedList<LabelValueEnabledBean>();
- for (String name : RepoInfo.getStandardRepos().keySet()) {
- repos.add(lve(name, name, false));
- }
- form.set(POSSIBLE_REPOS, (LabelValueEnabledBean[])
- repos.toArray(new LabelValueEnabledBean[0]));
- Set<RepoInfo> selected = ksdata.getRepoInfos();
- String [] items = new String[selected.size()];
- int i = 0;
- for (RepoInfo repo : selected) {
- items[i] = repo.getName();
- i++;
+ DynaActionForm form, KickstartData ksdata,
+ KickstartableTree tree) {
+
+ if (tree != null && !tree.getInstallType().isRhel2() &&
+ !tree.getInstallType().isRhel3() &&
+ !tree.getInstallType().isRhel4()) {
+ List <LabelValueEnabledBean> repos = new
LinkedList<LabelValueEnabledBean>();
+ for (String name : RepoInfo.getStandardRepos().keySet()) {
+ repos.add(lve(name, name, false));
+ }
+ form.set(POSSIBLE_REPOS, (LabelValueEnabledBean[])
+ repos.toArray(new LabelValueEnabledBean[0]));
+ Set<RepoInfo> selected = ksdata.getRepoInfos();
+ String [] items = new String[selected.size()];
+ int i = 0;
+ for (RepoInfo repo : selected) {
+ items[i] = repo.getName();
+ i++;
+ }
+ form.set(SELECTED_REPOS, items);
}
- form.set(SELECTED_REPOS, items);
}
/**
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp
index eea1562..cda5b3d 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp
@@ -101,10 +101,11 @@ function reloadForm(ctl) {
</c:choose>
</td>
</tr>
+ <c:if test = "${not empty
kickstartSoftwareForm.map.possibleRepos}">
<tr>
<th><bean:message key="softwareedit.jsp.repos"
/>:</th>
<td>
- <c:if test = "${not empty kickstartSoftwareForm.map.possibleRepos}">
+
<c:forEach items="${kickstartSoftwareForm.map.possibleRepos}"
var="item">
<html:multibox property="selectedRepos"
disabled="${item.disabled}">
${item.value}
@@ -112,10 +113,10 @@ function reloadForm(ctl) {
${item.label}
<br />
</c:forEach>
- </c:if><br/><rhn:tooltip
key="softwareedit.jsp.repos-tooltip"/>
+ <br/><rhn:tooltip key="softwareedit.jsp.repos-tooltip"/>
</td>
</tr>
-
+ </c:if>
<tr>
<td align="right"
colspan="2"><html:submit><bean:message
key="kickstartdetails.jsp.updatekickstart"/></html:submit></td>
</tr>
Show replies by date