X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FEditAlbumAjaxPage.java;h=6fe06bc0f747e92d7b46ea1a1b53993872b56da4;hb=a073898124dfcd550299c1f6ef707ee399bce270;hp=570d0274b21d6e50d2bc410b05b152926ba217a1;hpb=00a434a23c9ea1e57c63d8a3c0fc4b09277af431;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/EditAlbumAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/EditAlbumAjaxPage.java
index 570d027..6fe06bc 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/EditAlbumAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/EditAlbumAjaxPage.java
@@ -17,12 +17,20 @@
 
 package net.pterodactylus.sone.web.ajax;
 
+import java.util.Collections;
+
 import net.pterodactylus.sone.data.Album;
+import net.pterodactylus.sone.data.Image;
+import net.pterodactylus.sone.template.ParserFilter;
+import net.pterodactylus.sone.template.RenderFilter;
+import net.pterodactylus.sone.text.Part;
 import net.pterodactylus.sone.text.TextFilter;
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.sone.web.page.FreenetRequest;
+import net.pterodactylus.util.template.TemplateContext;
 
 import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableMap;
 
 /**
  * Page that stores a user’s album modifications.
@@ -31,14 +39,13 @@ import com.google.common.base.Optional;
  */
 public class EditAlbumAjaxPage extends JsonPage {
 
-	/**
-	 * Creates a new edit album AJAX page.
-	 *
-	 * @param webInterface
-	 *            The Sone web interface
-	 */
-	public EditAlbumAjaxPage(WebInterface webInterface) {
+	private final ParserFilter parserFilter;
+	private final RenderFilter renderFilter;
+
+	public EditAlbumAjaxPage(WebInterface webInterface, ParserFilter parserFilter, RenderFilter renderFilter) {
 		super("editAlbum.ajax", webInterface);
+		this.parserFilter = parserFilter;
+		this.renderFilter = renderFilter;
 	}
 
 	//
@@ -73,10 +80,16 @@ public class EditAlbumAjaxPage extends JsonPage {
 		try {
 			album.get().modify().setTitle(title).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description)).update();
 			webInterface.getCore().touchConfiguration();
-			return createSuccessJsonObject().put("albumId", album.get().getId()).put("title", album.get().getTitle()).put("description", album.get().getDescription());
+			return createSuccessJsonObject().put("albumId", album.get().getId()).put("title", album.get().getTitle()).put("description", parseDescription(album.get()));
 		} catch (IllegalStateException e) {
 			return createErrorJsonObject("invalid-album-title");
 		}
 	}
 
+	private String parseDescription(Album album) {
+		Iterable<Part> parts = (Iterable<Part>) parserFilter.format(new TemplateContext(), album.getDescription(),
+				ImmutableMap.<String, Object>builder().put("sone", album.getSone()).build());
+		return (String) renderFilter.format(new TemplateContext(), parts, Collections.<String, Object>emptyMap());
+	}
+
 }