X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FSoneAccessor.java;h=786b37546762b5bcf56aa8a604dfd5563a4906bd;hb=535ff37f006c1dd058590667e3b895ebc66af04a;hp=ab872d97a7819aa608f31fc0865bd09760bec139;hpb=629ddb006542df2b671e172d8f544815bbab639b;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
index ab872d9..786b375 100644
--- a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
@@ -19,6 +19,7 @@ package net.pterodactylus.sone.template;
 
 import static com.google.common.collect.FluentIterable.from;
 import static java.util.Arrays.asList;
+import static java.util.logging.Logger.getLogger;
 import static net.pterodactylus.sone.data.Album.FLATTENER;
 import static net.pterodactylus.sone.data.Album.IMAGES;
 
@@ -26,6 +27,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import net.pterodactylus.sone.core.Core;
+import net.pterodactylus.sone.data.LocalSone;
 import net.pterodactylus.sone.data.Profile;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.data.Sone.SoneStatus;
@@ -33,7 +35,6 @@ import net.pterodactylus.sone.freenet.wot.OwnIdentity;
 import net.pterodactylus.sone.freenet.wot.Trust;
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.sone.web.ajax.GetTimesAjaxPage;
-import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.template.Accessor;
 import net.pterodactylus.util.template.ReflectionAccessor;
 import net.pterodactylus.util.template.TemplateContext;
@@ -58,7 +59,7 @@ import net.pterodactylus.util.template.TemplateContext;
 public class SoneAccessor extends ReflectionAccessor {
 
 	/** The logger. */
-	private static final Logger logger = Logging.getLogger(SoneAccessor.class);
+	private static final Logger logger = getLogger("Sone.Data");
 
 	/** The core. */
 	private final Core core;
@@ -88,7 +89,7 @@ public class SoneAccessor extends ReflectionAccessor {
 			Sone currentSone = (Sone) templateContext.get("currentSone");
 			return (currentSone != null) && currentSone.equals(sone);
 		} else if (member.equals("modified")) {
-			return core.isModifiedSone(sone);
+			return sone.isLocal() ? core.isModifiedSone((LocalSone) sone) : false;
 		} else if (member.equals("status")) {
 			return sone.getStatus();
 		} else if (member.equals("unknown")) {
@@ -102,7 +103,7 @@ public class SoneAccessor extends ReflectionAccessor {
 		} else if (member.equals("new")) {
 			return !sone.isKnown();
 		} else if (member.equals("locked")) {
-			return core.isLocked(sone);
+			return sone.isLocal() ? core.isLocked((LocalSone) sone) : false;
 		} else if (member.equals("lastUpdatedText")) {
 			return GetTimesAjaxPage.getTime((WebInterface) templateContext.get("webInterface"), sone.getTime());
 		} else if (member.equals("trust")) {
@@ -118,6 +119,8 @@ public class SoneAccessor extends ReflectionAccessor {
 			return trust;
 		} else if (member.equals("allImages")) {
 			return from(asList(sone.getRootAlbum())).transformAndConcat(FLATTENER).transformAndConcat(IMAGES);
+		} else if (member.equals("albums")) {
+			return sone.getRootAlbum().getAlbums();
 		}
 		return super.get(templateContext, object, member);
 	}