java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java | 9 +++++++-- java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java | 9 ++++++++- java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-)
New commits: commit 416b2bad51eaa89a1a800402b83e3c38b2e49425 Author: Tomas Lestach tlestach@redhat.com Date: Thu Sep 9 11:49:11 2010 +0200
add None as channel checksum type option on the webUI
since it is possible to import RHEL4 channel (without checksum), we shall display the correct information and enable the user to change it
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 122ba10..294b41e 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 @@ -38,6 +38,7 @@ import com.redhat.rhn.common.security.PermissionException; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelArch; import com.redhat.rhn.domain.channel.ChannelFactory; +import com.redhat.rhn.domain.common.ChecksumType; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.domain.server.Server; @@ -642,8 +643,12 @@ public class EditChannelAction extends RhnAction implements Listable { } ctx.getRequest().setAttribute("channelArches", channelArches); // set the list of yum supported checksums - ctx.getRequest().setAttribute("checksums", - ChannelFactory.listYumSupportedChecksums()); + List checksums = new ArrayList(); + addOption(checksums, ls.getMessage("generic.jsp.none"), ""); + for (ChecksumType chType : ChannelFactory.listYumSupportedChecksums()) { + addOption(checksums, chType.getLabel(), chType.getLabel()); + } + ctx.getRequest().setAttribute("checksums", checksums);
}
diff --git a/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java b/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java index 53e7b5e..0e7a7a7 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java +++ b/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java @@ -66,7 +66,7 @@ public class UpdateChannelCommand extends CreateChannelCommand { }
ChecksumType ct = ChannelFactory.findChecksumTypeByLabel(checksum); - if (!ct.getLabel().equals(c.getChecksumTypeLabel()) && c.getPackageCount() > 0) { + if (checksumChanged(c.getChecksumTypeLabel(), ct) && c.getPackageCount() > 0) { // schedule repo re generation if the checksum type changed // and the channel has packages ChannelManager.queueChannelChange(c.getLabel(), @@ -93,4 +93,11 @@ public class UpdateChannelCommand extends CreateChannelCommand {
return c; } + + private boolean checksumChanged(String label, ChecksumType ct) { + if (ct == null || ct.getLabel() == null) { + return label != null; + } + return !ct.getLabel().equals(label); + } } 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 3a2c40a..70d3a20 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp @@ -98,7 +98,7 @@ <td class="small-form"> <html:select property="checksum"> <html:options collection="checksums" - property="label" + property="value" labelProperty="label" /> </html:select><br/> <span class="small-text"><bean:message key="channel.edit.jsp.checksumtip"/></span>
spacewalk-commits@lists.fedorahosted.org