ziver/zallery
1
0
Fork 0
Code Pull requests Releases Activity

Changed so that root folder is not a DB requirement and not created on the fly.

Browse source
This commit is contained in:
Ziver Koc 2018-08-13 21:10:08 +02:00
parent 5921a08b14
commit 8ea4f0d6d5
4 changed files with 91 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/zall/page/GalleryServlet.java
View file

@ -38,15 +38,12 @@ public class GalleryServlet extends ZalleryServlet {
folder = Folder.load(db, Long.parseLong(request.getParameter("folder")));
else {
folder = Folder.loadRoot(db, user);
// Setup new root folder
if (folder == null) {
folder = Folder.createRootFolder();
folder.save(db);
}
if (folder == null)
throw new NullPointerException("No root folder found in DB.");
}
List<Media> list = Media.load(db, folder);
List<Folder> subFolders = Folder.loadSubFolders(db, folder, user);
List<Folder> subFolders = Folder.loadSubFolders(db, folder);
//session.setAttribute("user", user);
request.setAttribute("folder", folder);