X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSoneTemplatePage.java;h=6afc3b7bd3d12271d3b7cf6996dc2befac7fd314;hb=fcd011a16b119966906b3137513e9432ab86c3a8;hp=40785856460d1904391a379d0a1018e4c38a3f33;hpb=00adeb7e4a42365d0b5feb4e38338285e91a2301;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 4078585..6afc3b7 100644
--- a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
@@ -111,7 +111,7 @@ public class SoneTemplatePage extends TemplatePage {
 			return null;
 		}
 		String soneId = (String) session.getAttribute("Sone.CurrentSone");
-		for (Sone sone : webInterface.core().localSones()) {
+		for (Sone sone : webInterface.core().getSones()) {
 			if (sone.getId().equals(soneId)) {
 				return sone;
 			}
@@ -129,7 +129,11 @@ public class SoneTemplatePage extends TemplatePage {
 	 */
 	protected void setCurrentSone(ToadletContext toadletContext, Sone sone) {
 		Session session = getCurrentSession(toadletContext);
-		session.setAttribute("Sone.CurrentSone", sone.getId());
+		if (sone == null) {
+			session.removeAttribute("Sone.CurrentSone");
+		} else {
+			session.setAttribute("Sone.CurrentSone", sone.getId());
+		}
 	}
 
 	//
@@ -158,6 +162,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";