Return to original page after creating the post.

diff --git a/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java b/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java
index bed96a4..d2bd5da 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java
@@ -19,6 +19,7 @@ package net.pterodactylus.sone.web;
 
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.web.page.Page.Request.Method;
 import net.pterodactylus.util.template.Template;
 
 /**
@@ -50,13 +51,16 @@ public class CreatePostPage extends SoneTemplatePage {
        @Override
        protected void processTemplate(Request request, Template template) throws RedirectException {
                super.processTemplate(request, template);
-               String text = request.getHttpRequest().getPartAsStringFailsafe("text", 65536).trim();
-               if (text.length() != 0) {
-                       Sone currentSone = getCurrentSone(request.getToadletContext());
-                       webInterface.core().createPost(currentSone, System.currentTimeMillis(), text);
-                       throw new RedirectException("index.html");
+               if (request.getMethod() == Method.POST) {
+                       String text = request.getHttpRequest().getPartAsStringFailsafe("text", 65536).trim();
+                       String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 64);
+                       if (text.length() != 0) {
+                               Sone currentSone = getCurrentSone(request.getToadletContext());
+                               webInterface.core().createPost(currentSone, System.currentTimeMillis(), text);
+                               throw new RedirectException(returnPage);
+                       }
+                       template.set("errorTextEmpty", true);
                }
-               template.set("errorTextEmpty", true);
        }
 
        //

diff --git a/src/main/resources/templates/include/updateStatus.html b/src/main/resources/templates/include/updateStatus.html
index 129c526..a769503 100644 (file)
--- a/src/main/resources/templates/include/updateStatus.html
+++ b/src/main/resources/templates/include/updateStatus.html
@@ -1,6 +1,7 @@
 <div id="update-status">
        <form action="createPost.html" method="post">
                <input type="hidden" name="formPassword" value="<% formPassword|html>" />
+               <input type="hidden" name="returnPage" value="<% request.uri|html>" />
                <label for="text"><%= Page.Index.Label.Text|l10n|html></label>
                <input class="status-input" name="text" />
                <button type="submit"><%= Page.Index.Button.Post|l10n|html></button>