X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FSoneTemplatePage.java;h=3d4cb804103c7781a1a83aa08bcdd0b358d04446;hb=e8ca06ebeb10e411775f3e835c14f8009c767e0d;hp=0b6b76055f61e8598e37754de311e069f946135b;hpb=8b25ea98d342ed2e3e80914448156145a3e6757d;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 0b6b760..3d4cb80 100644 --- a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java +++ b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java @@ -21,6 +21,7 @@ import java.util.Arrays; import java.util.Collection; import net.pterodactylus.sone.data.Sone; +import net.pterodactylus.sone.main.SonePlugin; import net.pterodactylus.sone.web.page.Page; import net.pterodactylus.sone.web.page.TemplatePage; import net.pterodactylus.util.template.Template; @@ -186,8 +187,12 @@ public class SoneTemplatePage extends TemplatePage { @Override protected void processTemplate(Request request, Template template) throws RedirectException { super.processTemplate(request, template); - template.set("currentSone", getCurrentSone(request.getToadletContext())); + template.set("currentSone", getCurrentSone(request.getToadletContext(), false)); template.set("request", request); + template.set("currentVersion", SonePlugin.VERSION); + template.set("hasLatestVersion", webInterface.getCore().getUpdateChecker().hasLatestVersion()); + template.set("latestVersion", webInterface.getCore().getUpdateChecker().getLatestVersion()); + template.set("latestVersionTime", webInterface.getCore().getUpdateChecker().getLatestVersionDate()); } /** @@ -195,7 +200,7 @@ public class SoneTemplatePage extends TemplatePage { */ @Override protected String getRedirectTarget(Page.Request request) { - if (requiresLogin() && (getCurrentSone(request.getToadletContext()) == null)) { + if (requiresLogin() && (getCurrentSone(request.getToadletContext(), false) == null)) { return "login.html"; } return null; @@ -207,7 +212,7 @@ public class SoneTemplatePage extends TemplatePage { @Override public boolean isEnabled(ToadletContext toadletContext) { if (requiresLogin()) { - return getCurrentSone(toadletContext) != null; + return getCurrentSone(toadletContext, false) != null; } return true; }