Merge branch 'next' into dev/image

[Sone.git] / src / main / java / net / pterodactylus / sone / web / ImageBrowserPage.java

diff --git a/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java b/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
index c204128..ed31283 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
@@ -19,8 +19,10 @@ package net.pterodactylus.sone.web;
 
 import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Image;
-import net.pterodactylus.util.template.DataProvider;
+import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.template.Template;
+import net.pterodactylus.util.template.TemplateContext;
 
 /**
  * The image browser page is the entry page for the image management.
@@ -49,20 +51,29 @@ public class ImageBrowserPage extends SoneTemplatePage {
         * {@inheritDoc}
         */
        @Override
-       protected void processTemplate(Request request, DataProvider dataProvider) throws RedirectException {
-               super.processTemplate(request, dataProvider);
+       protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
+               super.processTemplate(request, templateContext);
                String albumId = request.getHttpRequest().getParam("album", null);
                if (albumId != null) {
                        Album album = webInterface.getCore().getAlbum(albumId, false);
-                       dataProvider.set("albumRequested", true);
-                       dataProvider.set("album", album);
+                       templateContext.set("albumRequested", true);
+                       templateContext.set("album", album);
                        return;
                }
                String imageId = request.getHttpRequest().getParam("image", null);
                if (imageId != null) {
                        Image image = webInterface.getCore().getImage(imageId, false);
-                       dataProvider.set("imageRequested", true);
-                       dataProvider.set("image", image);
+                       templateContext.set("imageRequested", true);
+                       templateContext.set("image", image);
+                       return;
+               }
+               Sone sone = getCurrentSone(request.getToadletContext(), false);
+               String soneId = request.getHttpRequest().getParam("sone", null);
+               if (soneId != null) {
+                       sone = webInterface.getCore().getSone(soneId, false);
                }
+               templateContext.set("soneRequested", true);
+               templateContext.set("sone", sone);
        }
+
 }