Changeset 7310

Timestamp:

Mar 20, 2017, 9:17:26 AM (5 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #2064: Directories displayed in the file manager doesn't follow the selected option in view/preset

It was a combination of using incorrect method to set the options and an incorrect list of options.

Location:

trunk

Files:

• src/core/net/sf/basedb/util/FileUtil.java (modified) (4 diffs)
• www/filemanager/files/list_files.jsp (modified) (1 diff)

trunk/src/core/net/sf/basedb/util/FileUtil.java

@@ -57 +57 @@
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -355 +356 @@
     return tree;
   }
-  
   /**
     Load a minimal directory tree that includes at least all the specified directories 
@@ -371 +371 @@
     throws InvalidDataException, BaseException
   {
+    return loadMinimalDirectoryTree(dc, Include.ALL, directories);
+  }
+
+  /**
+    Load a minimal directory tree that includes at least all the specified directories 
+    and their parent directories all the way up to the root or as far as the logged in user
+    has read permission.
+    @param dc A DbControl for accessing the database
+    @param include Include settings for loading sub directories
+    @param directories An array of directories
+    @return A <code>Map</code> which maps a directory to a 
+      list of it's sub-directories. The map is guaranteed to contain an entry for each of
+      the given directories, but the list may be empty if there are no subdirectories
+    @throws BaseException If there is an error
+    @since 3.11
+  */
+  public static Map<Directory, List<Directory>> loadMinimalDirectoryTree(DbControl dc, Collection<Include> include, Directory... directories)
+    throws InvalidDataException, BaseException
+  {
     Map<Directory, List<Directory>> tree = new HashMap<Directory, List<Directory>>();
 
@@ -414 +433 @@
     );
     query.order(Orders.asc(Hql.property("name")));
-    query.include(Include.MINE, Include.SHARED, Include.OTHERS, Include.NOT_REMOVED, Include.REMOVED);
+    if (include != null && include.size() > 0)
+    {
+      query.setIncludes(include);
+    }
     query.setParameter("parents", all, Type.INT);
     

trunk/www/filemanager/files/list_files.jsp

@@ -115 +115 @@
   // Create directory query
   final ItemQuery<Directory> directoryQuery = Directory.getQuery();
-  directoryQuery.include(cc.getInclude());
+  directoryQuery.setIncludes(cc.getInclude());
   if (!isSearch) 
   {