java/code/src/com/redhat/rhn/frontend/action/kickstart/SystemDetailsEditAction.java |
12 ++--------
java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp |
10 +-------
java/code/webapp/WEB-INF/struts-config.xml |
1
3 files changed, 5 insertions(+), 18 deletions(-)
New commits:
commit b7fc787a7db0c9443c778b446fb14eb0aaaf5c2f
Author: Partha Aji <paji(a)redhat.com>
Date: Tue Mar 30 15:54:49 2010 -0400
522497 - Fixed a ks system details bug
The root passwords and passwords were being confirmed with wrong logic .
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/SystemDetailsEditAction.java
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/SystemDetailsEditAction.java
index ea30696..0c343b9 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/SystemDetailsEditAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/SystemDetailsEditAction.java
@@ -50,7 +50,6 @@ import javax.servlet.http.HttpServletResponse;
public class SystemDetailsEditAction extends RhnAction {
public static final String SE_LINUX_PARAM = "selinuxMode";
- private static final String PWD_CHANGED_PARAM = "pwdChanged";
/**
* {@inheritDoc}
@@ -121,11 +120,6 @@ public class SystemDetailsEditAction extends RhnAction {
RequestContext ctx = new RequestContext(request);
KickstartData ksdata = lookupKickstart(ctx, dynaForm);
request.setAttribute("ksdata", ksdata);
-
- if (StringUtils.isBlank(dynaForm.getString(PWD_CHANGED_PARAM))) {
- dynaForm.set("rootPassword", null);
- dynaForm.set("rootPasswordConfirm", null);
- }
try {
transferEdits(dynaForm, ksdata, ctx);
@@ -199,9 +193,9 @@ public class SystemDetailsEditAction extends RhnAction {
private void transferRootPasswordEdits(DynaActionForm form,
SystemDetailsCommand command) {
- if (!StringUtils.isBlank(form.getString(PWD_CHANGED_PARAM))) {
- String rootPw = form.getString("rootPassword");
- String rootPwConfirm = form.getString("rootPasswordConfirm");
+ String rootPw = form.getString("rootPassword");
+ String rootPwConfirm = form.getString("rootPasswordConfirm");
+ if (!StringUtils.isBlank(rootPw) || !StringUtils.isBlank(rootPwConfirm)) {
command.updateRootPassword(rootPw, rootPwConfirm);
}
}
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp
b/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp
index d9e34f1..d7ffd92 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp
@@ -23,11 +23,6 @@
toEnable.value = toDisable.value;
toDisable.value = "";
}
-
- function flagPassword() {
- var pwdChanged = document.getElementById("pwdChanged");
- pwdChanged.value = "true";
- }
// Workaround for apparent Firefox bug. See Red Hat Bugzilla #459411.
function init() {
@@ -61,7 +56,6 @@ boolean staticIfDisabled = Boolean.valueOf(
<html:form method="post"
action="/kickstart/SystemDetailsEdit.do">
<html:hidden property="ksid" />
<html:hidden property="submitted" />
- <html:hidden property="pwdChanged" styleId="pwdChanged" />
<h2><bean:message
key="kickstart.systemdetails.jsp.header1"/></h2>
<c:if test="${not ksdata.legacyKickstart}">
<h2><bean:message
key="kickstart.systemdetails.jsp.header2"/></h2>
@@ -95,11 +89,11 @@ boolean staticIfDisabled = Boolean.valueOf(
<table class="details">
<tr>
<th><bean:message key="kickstart.root.password.jsp.label"
/>:</th>
- <td><html:password property="rootPassword"
maxlength="32" size="32" onchange="flagPassword(); return
true;"/></td>
+ <td><html:password property="rootPassword"
maxlength="32" size="32" redisplay="false"/></td>
</tr>
<tr>
<th><bean:message
key="kickstart.root.password.verify.jsp.label" />:</th>
- <td><html:password property="rootPasswordConfirm"
maxlength="32" size="32" onchange="flagPassword(); return
true;"/></td>
+ <td><html:password property="rootPasswordConfirm"
maxlength="32" size="32" redisplay="false"/></td>
</tr>
<tr>
<td align="right" colspan="2">
diff --git a/java/code/webapp/WEB-INF/struts-config.xml
b/java/code/webapp/WEB-INF/struts-config.xml
index b627bf4..6c919f8 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -638,7 +638,6 @@
<form-property name="rootPassword"
type="java.lang.String" />
<form-property name="rootPasswordConfirm"
type="java.lang.String" />
<form-property name="submitted"
type="java.lang.Boolean" />
- <form-property name="pwdChanged"
type="java.lang.String" />
</form-bean>
<form-bean name="kickstartScriptForm"
Show replies by date