Changeset 5061

Timestamp:

Aug 19, 2009, 11:24:43 AM (13 years ago)

Author:

Nicklas Nordborg

Message:

References #108: Logging the change history of an item

• Add 'id' as an extra sort column so that events that have the same timestamp are sorted in the order they were added.

Location:

trunk

Files:

• src/core/net/sf/basedb/core/ItemContext.java (modified) (2 diffs)
• www/common/history/list_history.jsp (modified) (1 diff)

trunk/src/core/net/sf/basedb/core/ItemContext.java

@@ -1444 +1444 @@
       Items are sorted in ascending order.
     */
-    ASC(0, "ascending"),
+    ASC(0, "ascending")
+    {
+      @Override
+      public Order sortBy(Expression e)
+      {
+        return Orders.asc(e);
+      }
+    },
+    
     /**
       Items are sorted in descending order.
     */
-    DESC(1, "descending");
+    DESC(1, "descending")   
+    {
+      @Override
+      public Order sortBy(Expression e)
+      {
+        return Orders.desc(e);
+      }
+    };
   
     /**
@@ -1498 +1513 @@
     }
     
+    /**
+      Create an order expression that can be used with
+      queries: {@link Query#order(Order)}.
+      @param e The expression to sort by
+      @return An order object
+      @since 2.13
+    */
+    public abstract Order sortBy(Expression e);
+    
     public String toString()
     {

trunk/www/common/history/list_history.jsp

@@ -86 +86 @@
     final ItemQuery<ChangeHistory> query = 
       Base.getConfiguredQuery(dc, cc, true, ChangeHistory.getHistoryOf(source), mode);
+    query.order(cc.getSortDirection().sortBy(Hql.property("id")));
     history = query.iterate(dc);
     //cc.setMessage(query.toString());