diff options
Diffstat (limited to 'pysite')
| -rw-r--r-- | pysite/views/main/jams/join.py | 14 | ||||
| -rw-r--r-- | pysite/views/staff/jams/actions.py | 3 |
2 files changed, 8 insertions, 9 deletions
diff --git a/pysite/views/main/jams/join.py b/pysite/views/main/jams/join.py index 87a2c4ca..eeae1f76 100644 --- a/pysite/views/main/jams/join.py +++ b/pysite/views/main/jams/join.py @@ -28,9 +28,6 @@ class JamsJoinView(RouteView, DBMixin, OauthMixin): if not self.user_data: return redirect(url_for("discord.login")) - if self.get_response(jam, self.user_data["user_id"]): - return self.render("main/jams/already.html", jam=jam_obj) - infractions = self.get_infractions(self.user_data["user_id"]) for infraction in infractions: @@ -51,6 +48,9 @@ class JamsJoinView(RouteView, DBMixin, OauthMixin): # They already tried to apply for this jam return self.render("main/jams/banned.html", infraction=infraction, jam=jam_obj) + if self.get_response(jam, self.user_data["user_id"]): + return self.render("main/jams/already.html", jam=jam_obj) + form_obj = self.db.get(self.forms_table, jam) questions = [] @@ -73,9 +73,6 @@ class JamsJoinView(RouteView, DBMixin, OauthMixin): if not self.user_data: return redirect(url_for("discord.login")) - if self.get_response(jam, self.user_data["user_id"]): - return self.render("main/jams/already.html", jam=jam_obj) - infractions = self.get_infractions(self.user_data["user_id"]) for infraction in infractions: @@ -96,6 +93,9 @@ class JamsJoinView(RouteView, DBMixin, OauthMixin): # They already tried to apply for this jam return self.render("main/jams/banned.html", infraction=infraction, jam=jam_obj) + if self.get_response(jam, self.user_data["user_id"]): + return self.render("main/jams/already.html", jam=jam_obj) + form_obj = self.db.get(self.forms_table, jam) if not form_obj: @@ -162,14 +162,12 @@ class JamsJoinView(RouteView, DBMixin, OauthMixin): "answers": answers } - print(response) self.db.insert(self.responses_table, response) return self.render("main/jams/thanks.html", jam=jam_obj) def get_response(self, jam, user_id): query = self.db.query(self.responses_table).filter({"jam": jam, "snowflake": user_id}) result = self.db.run(query, coerce=list) - print(result) if result: return result[0] diff --git a/pysite/views/staff/jams/actions.py b/pysite/views/staff/jams/actions.py index f08b3635..1af215a5 100644 --- a/pysite/views/staff/jams/actions.py +++ b/pysite/views/staff/jams/actions.py @@ -183,7 +183,8 @@ class ActionView(APIView, DBMixin): result = self.db.insert(self.infractions_table, { "participant": participant, "reason": reason, - "number": number + "number": number, + "decremented_for": [] }) return jsonify({"id": result["generated_keys"][0]}) |