projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Return local Sones from core and web interface.
[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
1e83a0e
..
a8ee678
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
@@
-1,5
+1,5
@@
/*
/*
- * Sone - CreateAlbumPage.java - Copyright © 2011–201
2
David Roden
+ * Sone - CreateAlbumPage.java - Copyright © 2011–201
3
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,6
+18,7
@@
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.Album.Modifier.AlbumTitleMustNotBeEmpty;
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;
@@
-61,11
+62,18
@@
public class CreateAlbumPage extends SoneTemplatePage {
return;
}
String description = request.getHttpRequest().getPartAsStringFailsafe("description", 256).trim();
return;
}
String description = request.getHttpRequest().getPartAsStringFailsafe("description", 256).trim();
- Sone currentSone = getCurrentSone(request.getToadletContext());
+ Sone currentSone = getCurrentSone(request.getToadletContext())
.get()
;
String parentId = request.getHttpRequest().getPartAsStringFailsafe("parent", 36);
String parentId = request.getHttpRequest().getPartAsStringFailsafe("parent", 36);
- Album parent = webInterface.getCore().getAlbum(parentId, false);
+ Album parent = webInterface.getCore().getAlbum(parentId);
+ if (parentId.equals("")) {
+ parent = currentSone.getRootAlbum();
+ }
Album album = webInterface.getCore().createAlbum(currentSone, parent);
Album album = webInterface.getCore().createAlbum(currentSone, parent);
- album.setTitle(name).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description));
+ try {
+ album.modify().setTitle(name).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description)).update();
+ } catch (AlbumTitleMustNotBeEmpty atmnbe) {
+ throw new RedirectException("emptyAlbumTitle.html");
+ }
webInterface.getCore().touchConfiguration();
throw new RedirectException("imageBrowser.html?album=" + album.getId());
}
webInterface.getCore().touchConfiguration();
throw new RedirectException("imageBrowser.html?album=" + album.getId());
}