X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FEditAlbumPage.java;h=dfd75b31ffdfdb2fe54d6a6ec06947a705af5f14;hb=c2f9f5293a81bdf2606f56f3822779a4639a1356;hp=dc5c8faea143ba34daa67f221134cf5cdea4de1d;hpb=03a7fb4f25191e6bcb64bc953572aaf7f5958b19;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java b/src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java
index dc5c8fa..dfd75b3 100644
--- a/src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - EditAlbumPage.java - Copyright © 2011 David Roden
+ * Sone - EditAlbumPage.java - Copyright © 2011–2013 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -51,30 +51,19 @@ public class EditAlbumPage extends SoneTemplatePage {
 	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		super.processTemplate(request, templateContext);
 		if (request.getMethod() == Method.POST) {
-			Sone currentSone = getCurrentSone(request.getToadletContext());
 			String albumId = request.getHttpRequest().getPartAsStringFailsafe("album", 36);
 			Album album = webInterface.getCore().getAlbum(albumId, false);
 			if (album == null) {
 				throw new RedirectException("invalid.html");
 			}
-			if (!webInterface.getCore().isLocalSone(album.getSone())) {
+			if (!album.getSone().isLocal()) {
 				throw new RedirectException("noPermission.html");
 			}
 			if ("true".equals(request.getHttpRequest().getPartAsStringFailsafe("moveLeft", 4))) {
-				if (album.getParent() == null) {
-					currentSone.moveAlbumUp(album);
-					webInterface.getCore().touchConfiguration();
-					throw new RedirectException("imageBrowser.html?sone=" + currentSone.getId());
-				}
 				album.getParent().moveAlbumUp(album);
 				webInterface.getCore().touchConfiguration();
 				throw new RedirectException("imageBrowser.html?album=" + album.getParent().getId());
 			} else if ("true".equals(request.getHttpRequest().getPartAsStringFailsafe("moveRight", 4))) {
-				if (album.getParent() == null) {
-					currentSone.moveAlbumDown(album);
-					webInterface.getCore().touchConfiguration();
-					throw new RedirectException("imageBrowser.html?sone=" + currentSone.getId());
-				}
 				album.getParent().moveAlbumDown(album);
 				webInterface.getCore().touchConfiguration();
 				throw new RedirectException("imageBrowser.html?album=" + album.getParent().getId());
@@ -83,14 +72,14 @@ public class EditAlbumPage extends SoneTemplatePage {
 			if (webInterface.getCore().getImage(albumImageId, false) == null) {
 				albumImageId = null;
 			}
-			album.setAlbumImage(albumImageId);
+			album.modify().setAlbumImage(albumImageId).update();
 			String title = request.getHttpRequest().getPartAsStringFailsafe("title", 100).trim();
 			if (title.length() == 0) {
 				templateContext.set("titleMissing", true);
 				return;
 			}
 			String description = request.getHttpRequest().getPartAsStringFailsafe("description", 1000).trim();
-			album.setTitle(title).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description));
+			album.modify().setTitle(title).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description)).update();
 			webInterface.getCore().touchConfiguration();
 			throw new RedirectException("imageBrowser.html?album=" + album.getId());
 		}