X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FImageBrowserPage.java;h=778b429db1c29255e49c4e136c799ee34118ce05;hp=c20412862c839efe1a3867afaef873b95397fb69;hb=a23c4f218c3adf236d89d5927cae37d6e6e4feda;hpb=bd677054a502c55ea873f9660e5b570719b0e9de diff --git a/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java b/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java index c204128..778b429 100644 --- a/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java @@ -19,8 +19,9 @@ 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.util.template.Template; +import net.pterodactylus.util.template.TemplateContext; /** * The image browser page is the entry page for the image management. @@ -49,20 +50,29 @@ public class ImageBrowserPage extends SoneTemplatePage { * {@inheritDoc} */ @Override - protected void processTemplate(Request request, DataProvider dataProvider) throws RedirectException { - super.processTemplate(request, dataProvider); + protected void processTemplate(Request 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); } + }