X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FEditAlbumPage.java;h=9e4aae95d4816136e0cde0f33ad7a12f72f34ab2;hb=516dc04cff017c764741d164654d0091719cc173;hp=8f595a7dfac882e58ef83e1a8a94f4059ebf424a;hpb=0ebf4a7e60e64c6f1ebfdae0ffe169988a687468;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 8f595a7..9e4aae9 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
@@ -55,21 +55,30 @@ public class EditAlbumPage extends SoneTemplatePage {
 			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))) {
+				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))) {
+				album.getParent().moveAlbumDown(album);
+				webInterface.getCore().touchConfiguration();
+				throw new RedirectException("imageBrowser.html?album=" + album.getParent().getId());
+			}
 			String albumImageId = request.getHttpRequest().getPartAsStringFailsafe("album-image", 36);
 			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());
 		}