java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java | 6
+++
java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp | 17
+++++++---
2 files changed, 18 insertions(+), 5 deletions(-)
New commits:
commit 89404dabbcc81190562d6b540d2256467cc1f46a
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Dec 21 16:11:46 2012 +0100
set child channel checksum type to parent's
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
index b9d5dce..d404441 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
@@ -639,6 +639,12 @@ public class EditChannelAction extends RhnAction implements Listable
{
}
ctx.getRequest().setAttribute("parentChannelArches",
parentChannelArches);
+ HashMap parentChannelChecksums = new HashMap();
+ for (Channel c : bases) {
+ parentChannelChecksums.put(c.getId(), c.getChecksumTypeLabel());
+ }
+ ctx.getRequest().setAttribute("parentChannelChecksums",
parentChannelChecksums);
+
// base channel arches
List channelArches = new ArrayList();
List<ChannelArch> arches = ChannelManager.getChannelArchitectures();
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
b/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
index ae3391f..3356638 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp
@@ -7,12 +7,19 @@
<body>
<script type="text/javascript">
-function setChildChannelArch() {
-var baseChannels = {};
+function setChildChannelArchChecksum() {
+var baseChannelArches = {};
<c:forEach items="${parentChannelArches}" var="parentChannel">
-baseChannels["<c:out value="${parentChannel.key}" />"] =
"<c:out value="${parentChannel.value}"/>";
+baseChannelArches["<c:out value="${parentChannel.key}" />"] =
"<c:out value="${parentChannel.value}"/>";
</c:forEach>
-document.getElementById("parentarch").value =
baseChannels[document.getElementById("parent").value];
+
+var baseChannelChecksums = {};
+<c:forEach items="${parentChannelChecksums}"
var="parentChannel">
+baseChannelChecksums["<c:out value="${parentChannel.key}" />"]
= "<c:out value="${parentChannel.value}"/>";
+</c:forEach>
+
+document.getElementById("parentarch").value =
baseChannelArches[document.getElementById("parent").value];
+document.getElementById("checksum").value =
baseChannelChecksums[document.getElementById("parent").value];
}
</script>
@@ -70,7 +77,7 @@ document.getElementById("parentarch").value =
baseChannels[document.getElementBy
<c:choose>
<c:when test='${empty param.cid}'>
<html:select property="parent" styleId="parent"
- onchange="setChildChannelArch()">
+ onchange="setChildChannelArchChecksum()">
<html:options collection="parentChannels"
property="value"
labelProperty="label" />
Show replies by date