Changeset 4376

Timestamp:

Jul 4, 2008, 2:04:48 PM (15 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1066: Reset all filters functionality request

Location:

trunk

Files:

• src/core/common-queries.xml (modified) (1 diff)
• src/core/net/sf/basedb/core/SessionControl.java (modified) (2 diffs)
• www/include/menu.jsp (modified) (1 diff)
• www/my_base/user/submit_user.jsp (modified) (1 diff)

trunk/src/core/common-queries.xml

@@ -1898 +1898 @@
   </query>
   
+  <query id="LOAD_USER_CONTEXTS" type="HQL">
+    <sql>
+      SELECT ctx
+      FROM ContextData ctx
+      WHERE ctx.user.id = :user
+      AND ctx.client.id = :client
+      AND ctx.name = :name
+    </sql>
+    <description>
+      A Hibernate query that loads all saved context information
+      with a given name for a specific user/client.
+    </description>
+  </query>
+
   <query id="COUNT_PLUGINS_BY_TYPE_FOR_CONTEXT" type="HQL">
     <sql>

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

@@ -50 +50 @@
 
 import java.util.Date;
+import java.util.Iterator;
 import java.util.Set;
 import java.util.Map;
@@ -1581 +1582 @@
   
   /**
+    Delete all default contexts for the logged in user.
+    
+    @param itemType The item type to delete the contexts for, or null
+      to delete all contexts
+    @param inMemory TRUE to delete in-memory contexts
+    @param inDatabase TRUE to delete in-database contexts
+    @return The number of contexts deleted
+    @since 2.8
+  */
+  public int deleteCurrentContexts(Item itemType, boolean inMemory, boolean inDatabase)
+  {
+    int numDeleted = 0;
+    if (inMemory) 
+    {
+      if (itemType == null)
+      {
+        numDeleted += currentContexts.size();
+        currentContexts.clear();
+      }
+      else
+      {
+        Iterator<ItemContext> ccit = currentContexts.values().iterator();
+        while (ccit.hasNext())
+        {
+          ItemContext cc = ccit.next();
+          if (cc.getItemType() == itemType) 
+          {
+            ccit.remove();
+            numDeleted++;
+          }
+        }
+      }
+    }
+    
+    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)
+        {
+          if (itemType == null || itemType.getValue() == ctx.getItemType())
+          {
+            HibernateUtil.deleteData(session, ctx);
+            numDeleted++;
+          }
+        }
+        HibernateUtil.commit(tx);
+      }
+      catch (BaseException ex)
+      {
+        if (tx != null) HibernateUtil.rollback(tx);
+        throw ex;
+      }
+      finally
+      {
+        if (session != null) HibernateUtil.close(session);
+      }
+    }
+    return numDeleted;
+  }
+  
+  /**
     Get the value of a session setting with the specified name.
     @param name The name of the setting

trunk/www/include/menu.jsp

@@ -489 +489 @@
         title="Reload permissions" 
         onclick="<%="Main.openPopup('"+root+"my_base/user/submit_user.jsp?ID="+ID+"&cmd=ReloadPermissions', 'ReloadPermissions', 300, 200);"%>" 
+        tooltip="Reload permissions" 
+      />
+      <m:menuitem 
+        title="Reset list settings&hellip;" 
+        onclick="<%="Main.openPopup('"+root+"my_base/user/reset_filters.jsp?ID="+ID+"', 'ResetFilter', 400, 300);"%>" 
         tooltip="Reload permissions" 
       />

trunk/www/my_base/user/submit_user.jsp

@@ -155 +155 @@
     message = "Permissions reloaded";
   }
+  else if ("ResetFilters".equals(cmd))
+  {
+    boolean inDatabase = Values.getBoolean(request.getParameter("database"));
+    int numDeleted = sc.deleteCurrentContexts(null, true, inDatabase);
+    message = numDeleted + " list settings deleted";
+  }
+  else
+  {
+    throw new WebException("popup", "Invalid command", "The command {1} is not recognised as a valid command.", cmd);
+  }
 }
 finally