java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartProfileVariableAction.java
| 14 ++++++++++
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartVariableAction.java
| 3 --
2 files changed, 15 insertions(+), 2 deletions(-)
New commits:
commit 8c398e9254180e361351ef729dec016155cf4a13
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Aug 26 14:40:35 2009 -0400
498009 - fixing issue where kickstart label would not show up on kickstart variables
page
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartProfileVariableAction.java
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartProfileVariableAction.java
index b048814..6b587ab 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartProfileVariableAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartProfileVariableAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper;
+import org.apache.struts.action.DynaActionForm;
import org.cobbler.CobblerObject;
import org.cobbler.Profile;
@@ -51,5 +52,18 @@ public class KickstartProfileVariableAction extends
KickstartVariableAction {
protected String getObjectString() {
return RequestContext.KICKSTART_ID;
}
+
+ @Override
+ /**
+ * {@inheritDoc}
+ */
+ protected void setupFormValues(RequestContext ctx,
+ DynaActionForm form, String cId) {
+ super.setupFormValues(ctx, form, cId);
+ Long ksid = ctx.getRequiredParam(RequestContext.KICKSTART_ID);
+ KickstartData data = KickstartFactory.lookupKickstartDataByIdAndOrg(
+ ctx.getLoggedInUser().getOrg(), ksid);
+ ctx.getRequest().setAttribute("ksdata", data);
+ }
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartVariableAction.java
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartVariableAction.java
index ba55a6e..8a8c8a0 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartVariableAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartVariableAction.java
@@ -70,7 +70,6 @@ public abstract class KickstartVariableAction extends RhnAction {
setupFormValues(context, (DynaActionForm) formIn, cobblerId);
request.setAttribute(getObjectString(),
request.getParameter(getObjectString()));
-
return
getStrutsDelegate().forwardParams(mapping.findForward("default"),
request.getParameterMap());
@@ -142,7 +141,7 @@ public abstract class KickstartVariableAction extends RhnAction {
protected abstract String getCobblerId(RequestContext context);
protected abstract String getObjectString();
-
+
/**
* Get the CobblerObject that we'll use to set the ksmeta data
Show replies by date