Merge branch 'release/0.9-rc1'

[Sone.git] / src / main / java / net / pterodactylus / sone / web / ajax / EditAlbumAjaxPage.java

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 1bd94ca..238206a 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/ajax/EditAlbumAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/EditAlbumAjaxPage.java
@@ -49,7 +49,7 @@ public class EditAlbumAjaxPage extends JsonPage {
        @Override
        protected JsonReturnObject createJsonObject(FreenetRequest request) {
                String albumId = request.getHttpRequest().getParam("album");
-               Album album = webInterface.getCore().getAlbum(albumId, false);
+               Album album = webInterface.getCore().getAlbum(albumId);
                if (album == null) {
                        return createErrorJsonObject("invalid-album-id");
                }
@@ -57,20 +57,24 @@ public class EditAlbumAjaxPage extends JsonPage {
                        return createErrorJsonObject("not-authorized");
                }
                if ("true".equals(request.getHttpRequest().getParam("moveLeft"))) {
-                       Album swappedAlbum = (album.getParent() != null) ? album.getParent().moveAlbumUp(album) : album.getSone().moveAlbumUp(album);
+                       Album swappedAlbum = album.getParent().moveAlbumUp(album);
                        webInterface.getCore().touchConfiguration();
                        return createSuccessJsonObject().put("sourceAlbumId", album.getId()).put("destinationAlbumId", swappedAlbum.getId());
                }
                if ("true".equals(request.getHttpRequest().getParam("moveRight"))) {
-                       Album swappedAlbum = (album.getParent() != null) ? album.getParent().moveAlbumDown(album) : album.getSone().moveAlbumDown(album);
+                       Album swappedAlbum = album.getParent().moveAlbumDown(album);
                        webInterface.getCore().touchConfiguration();
                        return createSuccessJsonObject().put("sourceAlbumId", album.getId()).put("destinationAlbumId", swappedAlbum.getId());
                }
                String title = request.getHttpRequest().getParam("title").trim();
                String description = request.getHttpRequest().getParam("description").trim();
-               album.setTitle(title).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description));
-               webInterface.getCore().touchConfiguration();
-               return createSuccessJsonObject().put("albumId", album.getId()).put("title", album.getTitle()).put("description", album.getDescription());
+               try {
+                       album.modify().setTitle(title).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description)).update();
+                       webInterface.getCore().touchConfiguration();
+                       return createSuccessJsonObject().put("albumId", album.getId()).put("title", album.getTitle()).put("description", album.getDescription());
+               } catch (IllegalStateException e) {
+                       return createErrorJsonObject("invalid-album-title");
+               }
        }
 
 }