projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Check correct Sone for avatar image
[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
a8d024a
..
e0f0725
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
@@
-18,6
+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.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;
@@
-62,13
+64,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
, false
);
+ String parentId = request.getHttpRequest().getPartAsStringFailsafe("parent",
IdBuilder.ID_STRING_LENGTH
);
+ Album parent = webInterface.getCore().getAlbum(parentId);
if (parentId.equals("")) {
parent = currentSone.getRootAlbum();
}
Album album = webInterface.getCore().createAlbum(currentSone, parent);
if (parentId.equals("")) {
parent = currentSone.getRootAlbum();
}
Album album = webInterface.getCore().createAlbum(currentSone, parent);
- album.modify().setTitle(name).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description)).update();
+ 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());
}