Redirect to event page after upload

diff --git a/src/littlesongplace/songs.py b/src/littlesongplace/songs.py
index 22805ef25d897f9480262c94e867ccf8a47caccb..fd21ff035c869aa3f218a0b497a71e32a48c3103 100644 (file)
--- a/src/littlesongplace/songs.py
+++ b/src/littlesongplace/songs.py
@@ -266,8 +266,16 @@ def upload_song():
             return redirect(
                 f"/song/{userid}/{request.args['songid']}?action=view")
         else:
-            # After creating a new song, go back to profile
-            return redirect(f"/users/{username}")
+            # After creating a new song, go back to profile/event page
+            if "eventid" in request.args:
+                eventid = int(request.args["eventid"])
+                evt = db.query(
+                        "SELECT * FROM jam_events WHERE eventid = ?",
+                        [eventid], one=True)
+                jamid = evt["jamid"]
+                return redirect(f"/jams/{jamid}/events/{eventid}")
+            else:
+                return redirect(f"/users/{username}")
 
     else:
         username = session["username"]

diff --git a/src/littlesongplace/templates/jam-event.html b/src/littlesongplace/templates/jam-event.html
index 3b6fec466f013069b497fb642d571ce4f03a3aa1..7b8f7e97a3b02128a18a33f9153d744f196a971f 100644 (file)
--- a/src/littlesongplace/templates/jam-event.html
+++ b/src/littlesongplace/templates/jam-event.html
@@ -42,6 +42,7 @@
     <a class="button" href="/edit-song?eventid={{ event.eventid }}">Submit a Song</a>
     <br/>
     <br/>
+    {% if songs %}<p><small>This event has received {{ songs|length }} submission{% if songs|length > 1 %}s{% endif %}</small></p>{% endif %}
     {% include "song-list.html" %}
 
     <h2>Comments</h2>