projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change file names in copyright lines
[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
b7c7267
..
98e8909
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 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
*
* 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
@@
-18,9
+18,10
@@
package net.pterodactylus.sone.web;
import net.pterodactylus.sone.data.Album;
package net.pterodactylus.sone.web;
import net.pterodactylus.sone.data.Album;
-import net.pterodactylus.sone.web.page.
Page.Request.Method
;
+import net.pterodactylus.sone.web.page.
FreenetRequest
;
import net.pterodactylus.util.template.Template;
import net.pterodactylus.util.template.TemplateContext;
import net.pterodactylus.util.template.Template;
import net.pterodactylus.util.template.TemplateContext;
+import net.pterodactylus.util.web.Method;
/**
* Page that lets the user delete an {@link Album}.
/**
* Page that lets the user delete an {@link Album}.
@@
-45,24
+46,33
@@
public class DeleteAlbumPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(Request request, TemplateContext templateContext) throws RedirectException {
+ protected void processTemplate(
Freenet
Request request, TemplateContext templateContext) throws RedirectException {
super.processTemplate(request, templateContext);
if (request.getMethod() == Method.POST) {
String albumId = request.getHttpRequest().getPartAsStringFailsafe("album", 36);
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 (album == null) {
throw new RedirectException("invalid.html");
}
- if (!
webInterface.getCore().isLocalSone(album.getSone()
)) {
+ if (!
album.getSone().isLocal(
)) {
throw new RedirectException("noPermission.html");
}
throw new RedirectException("noPermission.html");
}
+ if (request.getHttpRequest().isPartSet("abortDelete")) {
+ throw new RedirectException("imageBrowser.html?album=" + album.getId());
+ }
Album parentAlbum = album.getParent();
webInterface.getCore().deleteAlbum(album);
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());
}
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);
+ if (album == null) {
+ throw new RedirectException("invalid.html");
+ }
+ templateContext.set("album", album);
}
}
}
}