projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release-0.9.5'
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
web
/
EditAlbumPage.java
diff --git
a/src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java
b/src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java
index
9e4aae9
..
6a08c3c
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java
@@
-1,5
+1,5
@@
/*
/*
- * Sone - EditAlbumPage.java - Copyright © 2011–201
3
David Roden
+ * Sone - EditAlbumPage.java - Copyright © 2011–201
6
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.text.TextFilter;
import net.pterodactylus.sone.web.page.FreenetRequest;
import net.pterodactylus.util.template.Template;
import net.pterodactylus.sone.text.TextFilter;
import net.pterodactylus.sone.web.page.FreenetRequest;
import net.pterodactylus.util.template.Template;
@@
-51,7
+52,7
@@
public class EditAlbumPage extends SoneTemplatePage {
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");
}
@@
-67,18
+68,13
@@
public class EditAlbumPage extends SoneTemplatePage {
webInterface.getCore().touchConfiguration();
throw new RedirectException("imageBrowser.html?album=" + album.getParent().getId());
}
webInterface.getCore().touchConfiguration();
throw new RedirectException("imageBrowser.html?album=" + album.getParent().getId());
}
- String albumImageId = request.getHttpRequest().getPartAsStringFailsafe("album-image", 36);
- if (webInterface.getCore().getImage(albumImageId, false) == null) {
- albumImageId = null;
- }
- album.modify().setAlbumImage(albumImageId).update();
String title = request.getHttpRequest().getPartAsStringFailsafe("title", 100).trim();
String title = request.getHttpRequest().getPartAsStringFailsafe("title", 100).trim();
- if (title.length() == 0) {
- templateContext.set("titleMissing", true);
- return;
- }
String description = request.getHttpRequest().getPartAsStringFailsafe("description", 1000).trim();
String description = request.getHttpRequest().getPartAsStringFailsafe("description", 1000).trim();
- album.modify().setTitle(title).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description)).update();
+ try {
+ album.modify().setTitle(title).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());
}