X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSoneTemplatePage.java;h=a152d303f4347a605a10f2a0b0a243f4bbf0b671;hb=374fd8726663084c37cf7ce2d7f752ca7a4f888e;hp=d6f1eb75e1d46b27cf5004f7d521fae9d7af6747;hpb=7da3ac7e3aa5eabbbfccf7eb0549e94d48a44cf5;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
index d6f1eb7..a152d30 100644
--- a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
@@ -100,17 +100,26 @@ public class SoneTemplatePage extends TemplatePage {
 	/**
 	 * Returns the currently logged in Sone.
 	 *
-	 * @param toadletContenxt
+	 * @param toadletContext
 	 *            The toadlet context
 	 * @return The currently logged in Sone, or {@code null} if no Sone is
 	 *         currently logged in
 	 */
-	protected Sone getCurrentSone(ToadletContext toadletContenxt) {
-		Session session = getCurrentSession(toadletContenxt);
+	protected Sone getCurrentSone(ToadletContext toadletContext) {
+		Session session = getCurrentSession(toadletContext);
 		if (session == null) {
 			return null;
 		}
-		return (Sone) session.getAttribute("Sone.CurrentSone");
+		String soneId = (String) session.getAttribute("Sone.CurrentSone");
+		if (soneId == null) {
+			return null;
+		}
+		for (Sone sone : webInterface.core().getSones()) {
+			if (sone.getId().equals(soneId)) {
+				return sone;
+			}
+		}
+		return null;
 	}
 
 	/**
@@ -123,7 +132,11 @@ public class SoneTemplatePage extends TemplatePage {
 	 */
 	protected void setCurrentSone(ToadletContext toadletContext, Sone sone) {
 		Session session = getCurrentSession(toadletContext);
-		session.setAttribute("Sone.CurrentSone", sone);
+		if (sone == null) {
+			session.removeAttribute("Sone.CurrentSone");
+		} else {
+			session.setAttribute("Sone.CurrentSone", sone.getId());
+		}
 	}
 
 	//
@@ -152,6 +165,15 @@ public class SoneTemplatePage extends TemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
+	protected void processTemplate(Request request, Template template) throws RedirectException {
+		super.processTemplate(request, template);
+		template.set("currentSone", getCurrentSone(request.getToadletContext()));
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
 	protected String getRedirectTarget(Page.Request request) {
 		if (requiresLogin() && (getCurrentSone(request.getToadletContext()) == null)) {
 			return "login.html";