stay on same page after submitting

2 files changed, 9 insertions, 3 deletions

diff --git a/app.py b/app.py
index 766b835..ddbf22f 100644
--- a/app.py
+++ b/app.py
@@ -89,20 +89,23 @@ def page(num):
 def submit():
     text = request.form['text']
     html = Markup(markdown.markdown(text, extensions=['markdown.extensions.nl2br'], output_format="html5", safe_mode="remove"))  # TODO safe_mode deprecated
+    page = request.form['redirpage']
     db().addJoke(html)
-    return redirect('/')
+    return redirect('/page/' + page)
 
 @app.route('/vote', methods=['POST'])
 def vote():
     objectId = request.form['id']
+    page = request.form['redirpage']
     db().voteJoke(objectId, request.form['vote'] == 'downvote')
-    return redirect('/')
+    return redirect('/page/' + page)
 
 @app.route('/report', methods=['POST'])
 def report():
     objectId = request.form['id']
+    page = request.form['redirpage']
     db().reportJoke(objectId)
-    return redirect('/')
+    return redirect('/page/' + page)
 
 @app.route('/static/<path:path>')
 def get_static(path):
diff --git a/templates/index.html b/templates/index.html
index f8bfa2c..c4e17b8 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -18,11 +18,13 @@
                 <div class="row">
                     <form action="/vote" method="post">
                         <input type="hidden" name="id" value="{{ joke.id }}">
+                        <input type="hidden" name="redirpage" value="{{ currentpage }}">
                         <button class="btn{% if joke.reports>0 %}-flat{% endif %} col s12" type="submit" name="vote" value="upvote"><i class="material-icons">thumb_up</i> {{ joke.upvotes }}</button>
                         <button class="btn{% if joke.reports>0 %}-flat{% endif %} col s12" type="submit" name="vote" value="downvote"><i class="material-icons">thumb_down</i> {{ joke.downvotes }}</button>
                     </form>
                     <form action="/report" method="post">
                         <input type="hidden" name="id" value="{{ joke.id }}">
+                        <input type="hidden" name="redirpage" value="{{ currentpage }}">
                         <button class="btn-flat col s12" type="submit">
                             {% if joke.reports>0 %}
                             <div class="row">
@@ -54,6 +56,7 @@
         <div class="divider hide-on-small-only"></div>
         <div class="section hide-on-small-only">
             <form action="/submit" method="post">
+                <input type="hidden" name="redirpage" value="{{ currentpage }}">
                 <div class="row valign-wrapper">
                     <div class="col s10 input-field">
                         <label for="text">Neuen Spruch hinzufügen</label>