projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the possibility to create images for unknown IDs.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
web
/
ImageBrowserPage.java
diff --git
a/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
b/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
index
766f018
..
1b00d81
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
@@
-27,8
+27,6
@@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Collections;
import java.util.List;
-import com.google.common.base.Optional;
-
import net.pterodactylus.sone.data.Album;
import net.pterodactylus.sone.data.Image;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.data.Album;
import net.pterodactylus.sone.data.Image;
import net.pterodactylus.sone.data.Sone;
@@
-38,6
+36,8
@@
import net.pterodactylus.util.number.Numbers;
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 com.google.common.base.Optional;
+
/**
* The image browser page is the entry page for the image management.
*
/**
* The image browser page is the entry page for the image management.
*
@@
-77,9
+77,9
@@
public class ImageBrowserPage extends SoneTemplatePage {
}
String imageId = request.getHttpRequest().getParam("image", null);
if (imageId != null) {
}
String imageId = request.getHttpRequest().getParam("image", null);
if (imageId != null) {
-
Image image = webInterface.getCore().getImage(imageId, false
);
+
Optional<Image> image = webInterface.getCore().getImage(imageId
);
templateContext.set("imageRequested", true);
templateContext.set("imageRequested", true);
- templateContext.set("image", image);
+ templateContext.set("image", image
.orNull()
);
return;
}
String soneId = request.getHttpRequest().getParam("sone", null);
return;
}
String soneId = request.getHttpRequest().getParam("sone", null);