diff options
| -rw-r--r-- | pysite/views/staff/jams/edit_ending.py | 5 | ||||
| -rw-r--r-- | pysite/views/staff/jams/edit_info.py | 2 | ||||
| -rw-r--r-- | templates/staff/jams/index.html | 12 |
3 files changed, 10 insertions, 9 deletions
diff --git a/pysite/views/staff/jams/edit_ending.py b/pysite/views/staff/jams/edit_ending.py index 69b91e29..c4dcfcb3 100644 --- a/pysite/views/staff/jams/edit_ending.py +++ b/pysite/views/staff/jams/edit_ending.py @@ -8,6 +8,7 @@ from pysite.mixins import DBMixin from pysite.rst import render REQUIRED_KEYS = ["end_rst"] +ALLOWED_STATES = ["judging", "finished"] class StaffView(RouteView, DBMixin): @@ -22,7 +23,7 @@ class StaffView(RouteView, DBMixin): if not jam_obj: return NotFound() - if not jam_obj["state"] == "judging": + if not jam_obj["state"] in ALLOWED_STATES: return BadRequest() return self.render("staff/jams/edit_ending.html", jam=jam_obj) @@ -35,7 +36,7 @@ class StaffView(RouteView, DBMixin): if not jam_obj: return NotFound() - if not jam_obj["state"] == "judging": + if not jam_obj["state"] in ALLOWED_STATES: return BadRequest() print(request.form) diff --git a/pysite/views/staff/jams/edit_info.py b/pysite/views/staff/jams/edit_info.py index 1debed5f..7d4401f0 100644 --- a/pysite/views/staff/jams/edit_info.py +++ b/pysite/views/staff/jams/edit_info.py @@ -8,7 +8,7 @@ from pysite.mixins import DBMixin from pysite.rst import render REQUIRED_KEYS = ["info_rst", "repo", "task_rst", "theme"] -ALLOWED_STATES = ["planning", "info"] +ALLOWED_STATES = ["planning", "announced", "finished"] class StaffView(RouteView, DBMixin): diff --git a/templates/staff/jams/index.html b/templates/staff/jams/index.html index 2ed83702..dea7429c 100644 --- a/templates/staff/jams/index.html +++ b/templates/staff/jams/index.html @@ -81,7 +81,7 @@ <i class="uk-icon fa-fw far fa-pencil"></i> Basics </a> - {% if jam.state in ["planning", "preparing", "announced"] %} + {% if jam.state in ["planning", "announced", "finished"] %} <a class="uk-button uk-button-default uk-width-expand" data-jam="{{ jam.number }}" id="jam-{{ jam.number }}-button-info" href="{{ url_for("staff.jams.edit.info", jam=jam.number) }}"> <i class="uk-icon fa-fw far fa-pencil"></i> Info </a> @@ -91,7 +91,7 @@ </a> {% endif %} - {% if jam.state == "judging" %} + {% if jam.state in ["judging", "finished"] %} <a class="uk-button uk-button-default uk-width-expand" data-jam="{{ jam.number }}" id="jam-{{ jam.number }}-button-ending" href="{{ url_for("staff.jams.edit.ending", jam=jam.number) }}"> <i class="uk-icon fa-fw far fa-pencil"></i> Ending </a> @@ -208,7 +208,7 @@ case "preparing": document.getElementById("state-" + jam + "-preparing").removeAttribute("hidden"); - document.getElementById("jam-" + jam + "-button-info").removeAttribute("hidden"); + document.getElementById("jam-" + jam + "-button-info").setAttribute("hidden", "hidden"); document.getElementById("jam-" + jam + "-button-ending").setAttribute("hidden", "hidden"); break; case "running": @@ -218,7 +218,7 @@ document.getElementById("jam-" + jam + "-button-ending").setAttribute("hidden", "hidden"); break; case "judging": - document.getElementById("state-" + jam + "-judging").removeAttribute("hidden"); + document.getElementById("state-" + jam + "-finished").removeAttribute("hidden"); document.getElementById("jam-" + jam + "-button-info").setAttribute("hidden", "hidden"); document.getElementById("jam-" + jam + "-button-ending").removeAttribute("hidden"); @@ -226,8 +226,8 @@ case "finished": document.getElementById("state-" + jam + "-finished").removeAttribute("hidden"); - document.getElementById("jam-" + jam + "-button-info").setAttribute("hidden", "hidden"); - document.getElementById("jam-" + jam + "-button-ending").setAttribute("hidden", "hidden"); + document.getElementById("jam-" + jam + "-button-info").removeAttribute("hidden"); + document.getElementById("jam-" + jam + "-button-ending").removeAttribute("hidden"); break; default: document.getElementById("state-" + jam + "-unknown").removeAttribute("hidden"); |