/*
- * 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
super.processTemplate(request, templateContext);
if (request.getMethod() == Method.POST) {
String albumId = request.getHttpRequest().getPartAsStringFailsafe("album", 36);
- Album album = webInterface.getCore().getAlbum(albumId, false);
+ Album album = webInterface.getCore().getAlbum(albumId);
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")) {
}
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());
}
String albumId = request.getHttpRequest().getParam("album");
- Album album = webInterface.getCore().getAlbum(albumId, false);
+ Album album = webInterface.getCore().getAlbum(albumId);
if (album == null) {
throw new RedirectException("invalid.html");
}