projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Process Sone templates in their own method
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
web
/
UnbookmarkPage.java
diff --git
a/src/main/java/net/pterodactylus/sone/web/UnbookmarkPage.java
b/src/main/java/net/pterodactylus/sone/web/UnbookmarkPage.java
index
7dfe301
..
aa5ef2a
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/UnbookmarkPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/UnbookmarkPage.java
@@
-19,6
+19,7
@@
package net.pterodactylus.sone.web;
import java.util.Set;
import java.util.Set;
+import net.pterodactylus.sone.data.IdBuilder;
import net.pterodactylus.sone.data.Post;
import net.pterodactylus.sone.web.page.FreenetRequest;
import net.pterodactylus.util.template.Template;
import net.pterodactylus.sone.data.Post;
import net.pterodactylus.sone.web.page.FreenetRequest;
import net.pterodactylus.util.template.Template;
@@
-52,10
+53,9
@@
public class UnbookmarkPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void processSonePage(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
if (request.getMethod() == Method.POST) {
if (request.getMethod() == Method.POST) {
- String id = request.getHttpRequest().getPartAsStringFailsafe("post",
36
);
+ String id = request.getHttpRequest().getPartAsStringFailsafe("post",
IdBuilder.ID_STRING_LENGTH
);
String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
Optional<Post> post = webInterface.getCore().getPost(id);
if (post.isPresent()) {
String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
Optional<Post> post = webInterface.getCore().getPost(id);
if (post.isPresent()) {
@@
-67,7
+67,7
@@
public class UnbookmarkPage extends SoneTemplatePage {
if (id.equals("allNotLoaded")) {
Set<Post> posts = webInterface.getCore().getBookmarkedPosts();
for (Post post : posts) {
if (id.equals("allNotLoaded")) {
Set<Post> posts = webInterface.getCore().getBookmarkedPosts();
for (Post post : posts) {
- if (post.
getSone() == null
) {
+ if (post.
isLoaded()
) {
webInterface.getCore().unbookmarkPost(post);
}
}
webInterface.getCore().unbookmarkPost(post);
}
}