Changeset 5203

Timestamp:

Dec 16, 2009, 12:56:43 PM (14 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1435: Reset settings for a specific list in the "Reset list settings" function

The user now has the option to reset the list settings for all lists or only for a specific list.

Location:

trunk

Files:

• src/core/net/sf/basedb/core/SessionControl.java (modified) (2 diffs)
• www/my_base/user/reset_filters.jsp (modified) (5 diffs)
• www/my_base/user/submit_user.jsp (modified) (1 diff)

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

@@ -47 +47 @@
 import net.sf.basedb.core.authentication.AuthenticationInformation;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
@@ -1631 +1632 @@
   
   /**
+    Get a list with the current default contexts. The list may include, 
+    only in-memory contexts, in-database contexts, or both. If both
+    options are enabled and an in-memory context also has a database
+    representation, both are included in the list. Eg. the list
+    may include more than one context were {@link ItemContext#getContextId()}
+    returns the same value.
+    
+    @param inMemory If TRUE, the in-memory contexts are included in the list
+    @param inDatabase If TRUE, the in-database contexts are included in the list
+    @return A list with ItemContext objects
+    @since 2.15
+  */
+  public List<ItemContext> getAllCurrentContexts(boolean inMemory, boolean inDatabase)
+  {
+    List<ItemContext> all = new ArrayList<ItemContext>();
+    if (inMemory)
+    {
+      all.addAll(currentContexts.values());
+    }
+    if (inDatabase)
+    {
+      org.hibernate.Session session = null;
+      org.hibernate.Transaction tx = null;
+      ItemContext context = null;
+      try
+      {
+        session = HibernateUtil.newSession();
+        tx = HibernateUtil.newTransaction(session);
+        
+        org.hibernate.Query query = HibernateUtil.getPredefinedQuery(session, 
+          "LOAD_USER_CONTEXTS");
+          /*
+            SELECT ctx 
+            FROM ContextData ctx
+            WHERE ctx.user.id = :user
+            AND ctx.client.id = :client
+            AND ctx.name = :name
+          */
+        query.setInteger("user", loginInfo.userId);
+        query.setInteger("client", getClientId());
+        query.setString("name", ItemContext.DEFAULT_NAME);
+        List<ContextData> contexts = HibernateUtil.loadList(ContextData.class, query, this);
+        for (ContextData ctx : contexts)
+        {
+          all.add(new ItemContext(ctx));
+        }
+        HibernateUtil.commit(tx);
+      }
+      catch (BaseException ex)
+      {
+        if (tx != null) HibernateUtil.rollback(tx);
+        throw ex;
+      }
+      finally
+      {
+        if (session != null) HibernateUtil.close(session);
+      }
+    }
+    return all;
+  }
+  
+  /**
     Delete all default contexts for the logged in user.
     

trunk/www/my_base/user/reset_filters.jsp

@@ -26 +26 @@
   import="net.sf.basedb.core.SessionControl"
   import="net.sf.basedb.core.Item"
+  import="net.sf.basedb.core.ItemContext"
   import="net.sf.basedb.core.DbControl"
   import="net.sf.basedb.core.User"
@@ -31 +32 @@
   import="net.sf.basedb.clients.web.util.HTML"
   import="net.sf.basedb.util.Values"
+  import="net.sf.basedb.util.ToStringComparator"
+  import="net.sf.basedb.util.NestedIterator"
+  import="java.util.Iterator"
   import="java.util.List"
   import="java.util.Set"
@@ -47 +51 @@
 {
   final User user = User.getById(dc, sc.getLoggedInUserId());
+  final List<ItemContext> inMemory = sc.getAllCurrentContexts(true, false);
+  final List<ItemContext> inDatabase = sc.getAllCurrentContexts(false, true);
+  final Set<Item> items = new TreeSet<Item>(new ToStringComparator<Item>(false));
+  final Set<Item> dbOnly = new HashSet<Item>();
+  Iterator<ItemContext> it = new NestedIterator(inMemory, inDatabase);
+  for (ItemContext ctx : inMemory)
+  {
+    if (ctx.getNumPropertyFilters() > 0 || ctx.getSortProperty() != null)
+    {
+      items.add(ctx.getItemType());
+    }
+  }
+  for (ItemContext ctx : inDatabase)
+  {
+    if (ctx.getNumPropertyFilters() > 0 || ctx.getSortProperty() != null)
+    {
+      if (items.add(ctx.getItemType())) dbOnly.add(ctx.getItemType());
+    }
+  }
   %>
-
   <base:page type="popup" title="<%="Reset list settings for "+HTML.encodeTags(user.getName())%>">
   <base:head>
@@ -56 +78 @@
       var frm = document.forms['preferences'];
       frm.submit();
+    }
+    function itemTypeOnChange()
+    {
+      var frm = document.forms['preferences'];
+      var dbOnly = frm.item_type[frm.item_type.selectedIndex].text.indexOf('*') >= 0;
+      frm.database.checked = dbOnly;
     }
     </script>
@@ -72 +100 @@
     <table class="form" cellspacing=0>
     <tr>
-      <td class="prompt">Which?</td>
+      <td class="prompt">Which list?</td>
+      <td>
+        <select name="item_type" onchange="itemTypeOnChange()">
+          <option value="">- all -
+          <%
+          for (Item item : items)
+          {
+            %>
+            <option value="<%=item.name()%>"><%=dbOnly.contains(item) ? "* " : "" %><%=item%>
+            <%
+          }
+          %>
+        </select><br>
+        * = This setting is only in the database
+      </td>
+    </tr>
+    <tr>
+      <td class="prompt">Location</td>
       <td>
       <input type="checkbox" name="memory" value="1" checked disabled>In-memory<br>

trunk/www/my_base/user/submit_user.jsp

@@ -157 +157 @@
   {
     boolean inDatabase = Values.getBoolean(request.getParameter("database"));
-    int numDeleted = sc.deleteCurrentContexts(null, true, inDatabase);
+    String itemType = Values.getStringOrNull(request.getParameter("item_type"));
+    Item item = itemType == null ? null : Item.valueOf(itemType);
+    int numDeleted = sc.deleteCurrentContexts(item, true, inDatabase);
     message = numDeleted + " list settings deleted";
   }