java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ScheduleRemoteCommand.java | 8
java/code/src/com/redhat/rhn/frontend/taglibs/SetTag.java | 94
+++-------
java/code/src/com/redhat/rhn/frontend/taglibs/rhn-taglib.tld | 5
3 files changed, 36 insertions(+), 71 deletions(-)
New commits:
commit 86829e4071a674e1225a1a33b9aa9dbe6316477c
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Aug 19 16:56:15 2011 +0200
691849 - forward only sid parameter
forwarding all of them causes HTTP 405
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ScheduleRemoteCommand.java
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ScheduleRemoteCommand.java
index d0d042b..f0fbd66 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ScheduleRemoteCommand.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ScheduleRemoteCommand.java
@@ -40,6 +40,7 @@ import org.apache.struts.action.DynaActionForm;
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -92,9 +93,10 @@ public class ScheduleRemoteCommand extends RhnAction {
strutsDelegate.saveMessages(request, msgs);
String mode = (String) f.get("mode");
+ Map params = new HashMap();
+ params.put("sid", sid);
forward = strutsDelegate.forwardParams(
- mapping.findForward(getForward(mode)),
- request.getParameterMap());
+ mapping.findForward(getForward(mode)), params);
}
return forward;
commit 1804774a3519ed42cc04118e1e01edf0eb204f9c
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Aug 19 16:55:30 2011 +0200
691849 - it's not allowed to store empty string to the DB
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ScheduleRemoteCommand.java
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ScheduleRemoteCommand.java
index d3a9ae8..d0d042b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ScheduleRemoteCommand.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ScheduleRemoteCommand.java
@@ -213,7 +213,7 @@ public class ScheduleRemoteCommand extends RhnAction {
ScriptActionDetails sad =
ActionManager.createScript(username, group, timeout, script);
ScriptRunAction sra = ActionManager.scheduleScriptRun(user, servers,
- "", sad, earliest);
+ null, sad, earliest);
List<Map<String, Long>> packs = getPackages(user, request,
sessionSetLabel);
int numPackages = packs.size();
PackageAction pa = schedulePackageAction(user, server, packs, mode,
earliest);
commit 456298ff963cbbb6267969ac53e8c537b897fad0
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Aug 19 14:23:42 2011 +0200
removing showImg attribute from SetTag
not used
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/SetTag.java
b/java/code/src/com/redhat/rhn/frontend/taglibs/SetTag.java
index a144b26..6a4dcdf 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/SetTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/SetTag.java
@@ -36,7 +36,6 @@ public class SetTag extends ColumnTag {
private String alt;
private String type;
private boolean showButtons = true;
- private boolean showImg = false;
private boolean disabled = false;
/**
@@ -121,63 +120,45 @@ public class SetTag extends ColumnTag {
throws IOException {
super.renderData(out, parent);
//Render contents of column here
- if (isShowImg()) {
- HtmlTag image = new HtmlTag("img");
- image.setAttribute("src", getImg());
-
- if (this.getTitle() != null) {
- image.setAttribute("title", LocalizationService.getInstance()
- .getMessage(this.getTitle()));
- }
-
- if (this.getAlt() != null) {
- image.setAttribute("alt", LocalizationService.getInstance()
- .getMessage(this.getAlt()));
- }
-
- out.print(image.render());
+ HtmlTag cbox = new HtmlTag("input");
+ if (type == null || type.equals("checkbox")) {
+ cbox.setAttribute("type", "checkbox");
+ cbox.setAttribute("onclick", "checkbox_clicked(this,
'" +
+ getSet().getLabel() + "')");
}
else {
- HtmlTag cbox = new HtmlTag("input");
- if (type == null || type.equals("checkbox")) {
- cbox.setAttribute("type", "checkbox");
- cbox.setAttribute("onclick", "checkbox_clicked(this,
'" +
- getSet().getLabel() + "')");
- }
- else {
- cbox.setAttribute("type", "radio");
- }
- cbox.setAttribute("name", "items_selected");
- cbox.setAttribute("value", getValue());
+ cbox.setAttribute("type", "radio");
+ }
+ cbox.setAttribute("name", "items_selected");
+ cbox.setAttribute("value", getValue());
- //Should checkbox be checked?
- if (checkboxChecked()) {
- cbox.setAttribute("checked", "true");
- parent.incrementChecked();
- }
+ //Should checkbox be checked?
+ if (checkboxChecked()) {
+ cbox.setAttribute("checked", "true");
+ parent.incrementChecked();
+ }
- //Should checkbox be disabled?
- if (disabled) {
- cbox.setAttribute("disabled", "disabled");
- }
+ //Should checkbox be disabled?
+ if (disabled) {
+ cbox.setAttribute("disabled", "disabled");
+ }
- if (this.getTitle() != null) {
- cbox.setAttribute("title", LocalizationService.getInstance()
- .getMessage(this.getTitle()));
- }
+ if (this.getTitle() != null) {
+ cbox.setAttribute("title", LocalizationService.getInstance()
+ .getMessage(this.getTitle()));
+ }
- if (this.getAlt() != null) {
- cbox.setAttribute("alt", LocalizationService.getInstance()
- .getMessage(this.getAlt()));
- }
+ if (this.getAlt() != null) {
+ cbox.setAttribute("alt", LocalizationService.getInstance()
+ .getMessage(this.getAlt()));
+ }
- HtmlTag hideme = new HtmlTag("input");
- hideme.setAttribute("type", "hidden");
- hideme.setAttribute("name", "items_on_page");
- hideme.setAttribute("value", getValue());
+ HtmlTag hideme = new HtmlTag("input");
+ hideme.setAttribute("type", "hidden");
+ hideme.setAttribute("name", "items_on_page");
+ hideme.setAttribute("value", getValue());
- out.print(cbox.render() + "\n" + hideme.render());
- }
+ out.print(cbox.render() + "\n" + hideme.render());
}
/**
@@ -281,18 +262,6 @@ public class SetTag extends ColumnTag {
this.img = imgIn;
}
/**
- * @return Returns the showImg.
- */
- public boolean isShowImg() {
- return showImg;
- }
- /**
- * @param showImgIn The showImg to set.
- */
- public void setShowImg(boolean showImgIn) {
- this.showImg = showImgIn;
- }
- /**
* @return Returns the title.
*/
public String getTitle() {
@@ -361,7 +330,6 @@ public class SetTag extends ColumnTag {
title = null;
alt = null;
type = null;
- showImg = false;
disabled = false;
super.release();
}
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-taglib.tld
b/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-taglib.tld
index c8cfb91..838a3f8 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-taglib.tld
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-taglib.tld
@@ -610,11 +610,6 @@
<required>false</required>
</attribute>
<attribute>
- <name>showImg</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
<name>disabled</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>