java/code/src/com/redhat/rhn/frontend/dto/PackageListItem.java | 8
++++++++
java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataQueueDriver.java | 9
+--------
java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataQueueWorker.java | 8
--------
java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp | 2 +-
4 files changed, 10 insertions(+), 17 deletions(-)
New commits:
commit ff0bba1d65be8e41ded74723a4c15da87dec1b57
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jul 25 12:10:53 2011 +0200
722453 - fix sort according to Installed time on PackageList.do
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/PackageListItem.java
b/java/code/src/com/redhat/rhn/frontend/dto/PackageListItem.java
index 02bccf4..88c5208 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/PackageListItem.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/PackageListItem.java
@@ -421,6 +421,14 @@ public class PackageListItem extends IdComboDto {
}
/**
+ * Getter for the Date object
+ * @return installTime Date object
+ */
+ public Date getInstallTimeObj() {
+ return installTime;
+ }
+
+ /**
* Setter for installTime
* @param installTimeIn to set
*/
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp
b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp
index a6b0813..cbbb136 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/packagelist.jsp
@@ -65,7 +65,7 @@
</c:choose>
</rl:column>
<rl:column headerkey="packagelist.jsp.installtime"
bound="false" styleclass="last-column"
- sortattr="installTime" sortable="true">
+ sortattr="installTimeObj" sortable="true">
<c:choose>
<c:when test ="${not empty
current.installTime}">${current.installTime}</c:when>
<c:otherwise><bean:message
key="packagelist.jsp.notspecified"/></c:otherwise>
commit ff4678f86f9b217903fad12a1e6d1fcea5f143d7
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jul 22 14:43:12 2011 +0200
removing some dead code
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataQueueDriver.java
b/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataQueueDriver.java
index df36670..586446f 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataQueueDriver.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataQueueDriver.java
@@ -25,7 +25,6 @@ import com.redhat.rhn.taskomatic.task.threaded.QueueWorker;
import org.apache.log4j.Logger;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -54,13 +53,7 @@ public class ErrataQueueDriver implements QueueDriver {
Map params = new HashMap();
List retval = new LinkedList();
try {
- List results = select.execute(params);
- if (results != null) {
- for (Iterator iter = results.iterator(); iter.hasNext();) {
- retval.add(iter.next());
- }
- }
- return retval;
+ return select.execute(params);
}
finally {
HibernateFactory.closeSession();
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataQueueWorker.java
b/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataQueueWorker.java
index 0b1292c..9f5545f 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataQueueWorker.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataQueueWorker.java
@@ -143,14 +143,6 @@ class ErrataQueueWorker implements QueueWorker {
return ErrataFactory.lookupById(new Long(errataId.longValue()));
}
- protected List findCandidates() throws Exception {
- SelectMode select = ModeFactory.getMode(TaskConstants.MODE_NAME,
- TaskConstants.TASK_QUERY_ERRATA_QUEUE_FIND_CANDIDATES);
- Map params = new HashMap();
- params.put("threshold", new Integer(1));
- return select.execute(params);
- }
-
private void scheduleAutoUpdates(Errata errata,
ActionStatus queuedStatus, Channel chan) throws Exception {
logger.debug("Scheduling auto updates for " + errata.getAdvisoryName()
+ "(" +
Show replies by date