parent
d3b4793113
commit
36cee77790
9 changed files with 84 additions and 19 deletions
|
|
@ -260,7 +260,7 @@ public class Zallery extends HttpServlet{
|
|||
if(request.getParameter("folder") != null && !request.getParameter("folder").equalsIgnoreCase("null"))
|
||||
folder = Folder.load(db, Long.parseLong(request.getParameter("folder")) );
|
||||
else{
|
||||
folder = Folder.loadRoot(db);
|
||||
folder = Folder.loadRoot(db, user);
|
||||
// Setup new root folder
|
||||
if( folder == null ){
|
||||
folder = Folder.genRoot();
|
||||
|
|
@ -268,7 +268,7 @@ public class Zallery extends HttpServlet{
|
|||
}
|
||||
}
|
||||
List<Media> list = Media.load(db, folder);
|
||||
List<Folder> subFolders = Folder.loadSubFolders(db, folder.getId());
|
||||
List<Folder> subFolders = Folder.loadSubFolders(db, folder.getId(), user);
|
||||
|
||||
//session.setAttribute("user", user);
|
||||
request.setAttribute("folder", folder);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue