java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/TreeDeleteAction.java | 4
++-
java/code/src/com/redhat/rhn/frontend/action/systems/BaseSystemsAction.java | 11
----------
java/spacewalk-java.spec | 6
++++-
rel-eng/packages/spacewalk-java | 2
-
4 files changed, 9 insertions(+), 14 deletions(-)
New commits:
commit 817f6f19285aa1fbb0428da6c183c8191ef13d59
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Aug 22 11:32:16 2011 +0200
Automatic commit of package [spacewalk-java] release [1.6.26-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index ab57d43..bced6b7 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.6.25
+Version: 1.6.26
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -546,6 +546,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Aug 22 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.26-1
+- fix deleting kickstart tree distribution (tlestach(a)redhat.com)
+- do not see a reason to set these attributes (tlestach(a)redhat.com)
+
* Mon Aug 22 2011 Martin Minar <mminar(a)redhat.com> 1.6.25-1
- 585010 - mark the Update List button with it so that we can disable it later.
(jpazdziora(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 913e452..6213235 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.6.25-1 java/
+1.6.26-1 java/
commit 02615216b445d80bcce43b7d5fa91a4ce2c3c5ae
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Aug 22 11:29:11 2011 +0200
fix deleting kickstart tree distribution
caused by: ef27f021d35462cbc6c4e58cdf71b97270b85076
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/TreeDeleteAction.java
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/TreeDeleteAction.java
index d803e06..a690d2b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/TreeDeleteAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/TreeDeleteAction.java
@@ -26,6 +26,8 @@ import org.apache.struts.action.DynaActionForm;
import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+
/**
* TreeDeleteAction class for deleting Kickstart Trees
* @version $Rev: 1 $
@@ -70,7 +72,7 @@ public class TreeDeleteAction extends BaseTreeAction {
* {@inheritDoc}
*/
protected ValidatorError processCommandSetters(PersistOperation operation,
- DynaActionForm form) {
+ DynaActionForm form, HttpServletRequest request) {
return null;
}
commit 3ee0d53d85b1d919b0bb119dd8e794b3282b11b8
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Aug 19 17:39:08 2011 +0200
do not see a reason to set these attributes
removing ...
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/BaseSystemsAction.java
b/java/code/src/com/redhat/rhn/frontend/action/systems/BaseSystemsAction.java
index 94e4e9e..900ab57 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/BaseSystemsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/BaseSystemsAction.java
@@ -14,7 +14,6 @@
*/
package com.redhat.rhn.frontend.action.systems;
-import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.domain.rhnset.RhnSet;
import com.redhat.rhn.domain.user.User;
@@ -77,16 +76,6 @@ public abstract class BaseSystemsAction extends RhnListAction {
request.setAttribute("pageList", result);
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
- /**
- * This may not be the best spot...
- */
- request.setAttribute("scCrit", ConfigDefaults.get().getSCCrit());
- request.setAttribute("scImp", ConfigDefaults.get().getSCImp());
- request.setAttribute("scMod", ConfigDefaults.get().getSCMod());
- request.setAttribute("scLow", ConfigDefaults.get().getSCLow());
- request.setAttribute("scBug", ConfigDefaults.get().getSCBug());
- request.setAttribute("scEhn", ConfigDefaults.get().getSCEnh());
-
TagHelper.bindElaboratorTo("systemList", result.getElaborator(),
request);
return mapping.findForward("default");