Insert a root album into all Sones to get rid of album manipulation in the Sone.

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

diff --git a/src/main/java/net/pterodactylus/sone/web/DeleteAlbumPage.java b/src/main/java/net/pterodactylus/sone/web/DeleteAlbumPage.java
index 2f2b766..391e9ff 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/DeleteAlbumPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/DeleteAlbumPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - DeleteAlbumPage.java - Copyright © 2011–2012 David Roden
+ * Sone - DeleteAlbumPage.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
@@ -54,7 +54,7 @@ public class DeleteAlbumPage 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 (request.getHttpRequest().isPartSet("abortDelete")) {
@@ -62,7 +62,7 @@ public class DeleteAlbumPage extends SoneTemplatePage {
                        }
                        Album parentAlbum = album.getParent();
                        webInterface.getCore().deleteAlbum(album);
-                       if (parentAlbum == null) {
+                       if (parentAlbum.equals(album.getSone().getRootAlbum())) {
                                throw new RedirectException("imageBrowser.html?sone=" + album.getSone().getId());
                        }
                        throw new RedirectException("imageBrowser.html?album=" + parentAlbum.getId());