Changeset 5053

Timestamp:

Aug 18, 2009, 11:52:16 AM (13 years ago)

Author:

Nicklas Nordborg

Message:

References #108: Logging the change history of an item

• Changed default sort order to sort by descending time, eg. most recent change first.

Location:

trunk

Files:

• src/clients/web/net/sf/basedb/clients/web/Base.java (modified) (3 diffs)
• www/common/history/index.jsp (modified) (1 diff)

trunk/src/clients/web/net/sf/basedb/clients/web/Base.java

@@ -58 +58 @@
 import net.sf.basedb.core.ItemResultIterator;
 import net.sf.basedb.core.Unit;
+import net.sf.basedb.core.ItemContext.SortDirection;
 import net.sf.basedb.core.query.EntityQuery;
 import net.sf.basedb.core.query.Restrictions;
@@ -884 +885 @@
     Create a default <code>ItemContext</code> with settings for default
     visible columns and sort property. 'MINE' and 'SHARED' objects are set to be included.
-    @param sortProperty The property, as a String, to sort on. 
+    @param sortProperty The property, as a String, to sort on. If it starts with
+      a '-', the sort is made in descending order (and the minus is removed)
     @param defaultColumns The visible columns as a comma separated String.
     @return an {@link net.sf.basedb.core.ItemContext} object
@@ -890 +892 @@
   public static ItemContext createDefaultContext(String sortProperty, String defaultColumns)
   {
-    ItemContext cc = new ItemContext(sortProperty, ItemContext.SortDirection.ASC, 30, 0);
+    SortDirection sortDirection = SortDirection.ASC;
+    if (sortProperty.startsWith("-"))
+    {
+      sortDirection = SortDirection.DESC;
+      sortProperty = sortProperty.substring(1);
+    }
+    ItemContext cc = new ItemContext(sortProperty, sortDirection, 30, 0);
     cc.setSetting("columns", defaultColumns);
     cc.setObject("defaultColumns", defaultColumns);

trunk/www/common/history/index.jsp

@@ -63 +63 @@
 <%!
   private static final ItemContext defaultContext = 
-    Base.createDefaultContext("$hst.time", "time,changeType,user,changeInfo");
+    Base.createDefaultContext("-$hst.time", "time,changeType,user,changeInfo");
   private static final Item itemType = Item.CHANGEHISTORY;
 %>