java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java | 46 +++++----- java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf | 14 --- java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf | 21 +++- java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp | 15 --- 4 files changed, 42 insertions(+), 54 deletions(-)
New commits: commit 1f2d364188f760587962e6b39f041e0cd5f5e962 Author: Partha Aji paji@redhat.com Date: Tue Jun 30 14:06:22 2009 -0400
508705 - Fixed KS details page to hide virt options if virt type is none
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java index 93f74ef..1e65b36 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java @@ -146,29 +146,29 @@ public class KickstartDetailsEditAction extends BaseKickstartEditAction { form.set(KERNEL_OPTIONS, prof.getKernelOptionsString()); form.set(POST_KERNEL_OPTIONS, prof.getKernelPostOptionsString()); } - - if (prof == null) { - form.set(VIRT_BRIDGE, Config.get().getDefaultXenVirtBridge()); - form.set(VIRT_CPU, Config.get().getDefaultVirtCpus()); - form.set(VIRT_DISK_SIZE, Config.get().getDefaultVirtDiskSize()); - form.set(VIRT_MEMORY, Config.get().getDefaultVirtMemorySize()); - } - else { - setFormValueOrDefault(form, VIRT_BRIDGE, prof.getVirtBridge(), - Config.get().getDefaultXenVirtBridge()); - setFormValueOrDefault(form, VIRT_CPU, prof.getVirtCpus(), - Config.get().getDefaultVirtCpus()); - setFormValueOrDefault(form, VIRT_DISK_SIZE, prof.getVirtFileSize(), - Config.get().getDefaultVirtDiskSize()); - setFormValueOrDefault(form, VIRT_MEMORY, prof.getVirtRam(), - Config.get().getDefaultVirtMemorySize()); - } - - - //Should we show virt options? - ctx.getRequest().setAttribute(IS_VIRT, !data.getKickstartDefaults(). - getVirtualizationType().equals(KickstartFactory.VIRT_TYPE_PV_HOST)); - + KickstartVirtualizationType type = data.getKickstartDefaults(). + getVirtualizationType(); + //Should we show virt options? + if (!type.equals(KickstartVirtualizationType.paraHost()) && + !type.equals(KickstartVirtualizationType.none())) { + if (prof == null) { + form.set(VIRT_BRIDGE, Config.get().getDefaultXenVirtBridge()); + form.set(VIRT_CPU, Config.get().getDefaultVirtCpus()); + form.set(VIRT_DISK_SIZE, Config.get().getDefaultVirtDiskSize()); + form.set(VIRT_MEMORY, Config.get().getDefaultVirtMemorySize()); + } + else { + setFormValueOrDefault(form, VIRT_BRIDGE, prof.getVirtBridge(), + Config.get().getDefaultXenVirtBridge()); + setFormValueOrDefault(form, VIRT_CPU, prof.getVirtCpus(), + Config.get().getDefaultVirtCpus()); + setFormValueOrDefault(form, VIRT_DISK_SIZE, prof.getVirtFileSize(), + Config.get().getDefaultVirtDiskSize()); + setFormValueOrDefault(form, VIRT_MEMORY, prof.getVirtRam(), + Config.get().getDefaultVirtMemorySize()); + } + ctx.getRequest().setAttribute(IS_VIRT, Boolean.TRUE); + } }
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf index 571b990..e290a04 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf @@ -30,18 +30,8 @@
</td> </tr> - <tr> - <th><bean:message key="kickstart.jsp.create.wizard.virtualization.label" /></th> - <td colspan="2" align="left"> - <html:select property="virtualizationTypeLabel"> - <html:optionsCollection property="virtualizationTypes" label="formattedName" value="label" /> - </html:select> - </td> - </tr> - - <c:if test="${is_virt}"> - <%@ include file="/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf" %> - </c:if> + <%@ include file="/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf" %> +
<c:if test="${empty requestScope.create}"> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf index cbcb96d..93506eb 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf @@ -1,7 +1,15 @@ - - - - + <tr> + <th><bean:message key="kickstartdetails.jsp.virtualization_type" /></th> + <td colspan="2" align="left"> + <html:select property="virtualizationTypeLabel" onchange="this.form.submit();return true;"> + <html:optionsCollection property="virtualizationTypes" label="formattedName" value="label"/> + </html:select><br/> + <c:if test="${not ksdata.rawData}"> + <span class="small-text"><bean:message key="kickstartdetails.jsp.virtTypeChangeWarning" arg0="${ksdata.id}"/></span> + </c:if> + </td> + </tr> +<c:if test="${not empty requestScope.is_virt}"> <tr> <th><bean:message key="kickstartdetails.jsp.virt_mem_mb"/>:</th> <td><html:text property="virt_mem_mb" size="10" /></td> @@ -19,5 +27,6 @@ <tr> <th><bean:message key="kickstartdetails.jsp.virt_bridge"/>:</th> <td><html:text property="virt_bridge" size="10" /></td> - </tr> - \ No newline at end of file + </tr> + +</c:if> \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp index ccab725..eca73ce 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp @@ -32,20 +32,9 @@ <td><strong><c:out value="${ksdata.kickstartDefaults.kstree.channel.name}"/></strong> <a href="/rhn/kickstart/KickstartSoftwareEdit.do?ksid=${ksdata.id}">(<bean:message key="kickstartdetails.jsp.changeos"/>)</a></td> </tr> - <tr> - <th><bean:message key="kickstartdetails.jsp.virtualization_type" /></th> - <td colspan="2" align="left"> - <html:select property="virtualizationTypeLabel"> - <html:optionsCollection property="virtualizationTypes" label="formattedName" value="label" /> - </html:select><br/> - <span class="small-text"><bean:message key="kickstartdetails.jsp.virtTypeChangeWarning" arg0="${ksdata.id}"/></span> - </td> - </tr> -
- <c:if test="${is_virt}"> - <%@ include file="/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf" %> - </c:if> + <%@ include file="/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf" %> +
spacewalk-commits@lists.fedorahosted.org