projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Let core be an album provider
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
web
/
CreateAlbumPage.java
diff --git
a/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
b/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
index
9f9f795
..
338056a
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
@@
-18,7
+18,8
@@
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.data.AlbumImpl.AlbumTitleMustNotBeEmpty;
+import net.pterodactylus.sone.data.Album.Modifier.AlbumTitleMustNotBeEmpty;
+import net.pterodactylus.sone.data.IdBuilder;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.text.TextFilter;
import net.pterodactylus.sone.web.page.FreenetRequest;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.text.TextFilter;
import net.pterodactylus.sone.web.page.FreenetRequest;
@@
-26,6
+27,8
@@
import net.pterodactylus.util.template.Template;
import net.pterodactylus.util.template.TemplateContext;
import net.pterodactylus.util.web.Method;
import net.pterodactylus.util.template.TemplateContext;
import net.pterodactylus.util.web.Method;
+import com.google.common.base.Optional;
+
/**
* Page that lets the user create a new album.
*
/**
* Page that lets the user create a new album.
*
@@
-63,12
+66,17
@@
public class CreateAlbumPage extends SoneTemplatePage {
}
String description = request.getHttpRequest().getPartAsStringFailsafe("description", 256).trim();
Sone currentSone = getCurrentSone(request.getToadletContext());
}
String description = request.getHttpRequest().getPartAsStringFailsafe("description", 256).trim();
Sone currentSone = getCurrentSone(request.getToadletContext());
- String parentId = request.getHttpRequest().getPartAsStringFailsafe("parent",
36
);
-
Album parent = webInterface.getCore().getAlbum(parentId)
;
+ String parentId = request.getHttpRequest().getPartAsStringFailsafe("parent",
IdBuilder.ID_STRING_LENGTH
);
+
Optional<Album> parent
;
if (parentId.equals("")) {
if (parentId.equals("")) {
- parent = currentSone.getRootAlbum();
+ parent = Optional.of(currentSone.getRootAlbum());
+ } else {
+ parent = webInterface.getCore().getAlbum(parentId);
+ if (!parent.isPresent()) {
+ throw new RedirectException("noPermission.html");
+ }
}
}
- Album album = webInterface.getCore().createAlbum(currentSone, parent);
+ Album album = webInterface.getCore().createAlbum(currentSone, parent
.get()
);
try {
album.modify().setTitle(name).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description)).update();
} catch (AlbumTitleMustNotBeEmpty atmnbe) {
try {
album.modify().setTitle(name).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description)).update();
} catch (AlbumTitleMustNotBeEmpty atmnbe) {