From mzazrive@fedoraproject.org Thu Aug 20 12:13:43 2015 From: Milan Zazrivec To: spacewalk-commits@lists.fedorahosted.org Subject: java/code Date: Fri, 21 Dec 2012 15:12:37 +0000 Message-ID: <20121221151237.30654A0C29@fedorahosted.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8952676533638290963==" --===============8952676533638290963== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelActio= n.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 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/Edit= ChannelAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/man= age/EditChannelAction.java index b9d5dce..d404441 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannel= Action.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannel= Action.java @@ -639,6 +639,12 @@ public class EditChannelAction extends RhnAction impleme= nts Listable { } ctx.getRequest().setAttribute("parentChannelArches", parentChannelAr= ches); =20 + HashMap parentChannelChecksums =3D new HashMap(); + for (Channel c : bases) { + parentChannelChecksums.put(c.getId(), c.getChecksumTypeLabel()); + } + ctx.getRequest().setAttribute("parentChannelChecksums", parentChanne= lChecksums); + // base channel arches List channelArches =3D new ArrayList(); List arches =3D ChannelManager.getChannelArchitectures(= ); diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp b/java/co= de/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 @@ =20 =20 @@ -70,7 +77,7 @@ document.getElementById("parentarch").value =3D baseChannel= s[document.getElementBy + onchange=3D"setChildChannelArchChecksum()"> --===============8952676533638290963==--