diff --git a/management/views.py b/management/views.py index 489e81edd9940fcf88b64ef41caf437912feadeb..7cf1c07f6b7c24c338ecf1651dc97366442aa5f4 100644 --- a/management/views.py +++ b/management/views.py @@ -93,7 +93,7 @@ def session_detail(request, pk=None): session = manager.sessions.get(id=pk) context = { 'session': session, - 'existing_elections': bool(session.elections), + 'existing_elections': (session.elections.count() > 0), 'open_elections': open_elections(session), 'upcoming_elections': upcoming_elections(session), 'published_elections': published_elections(session), diff --git a/vote/templates/vote/index.html b/vote/templates/vote/index.html index 08ec37e7a9f08046faeec35f13f9272a18a2559d..2435d842920f8b713c5f5ecd073ba8708a01ddee 100644 --- a/vote/templates/vote/index.html +++ b/vote/templates/vote/index.html @@ -14,7 +14,11 @@ </div> </div> <div id="electionCard"> - {% if open_elections %} + {% if not existing_elections %} + <div class="list-group-item mt-3"> + <span>There are no elections for this session</span> + </div> + {% elif open_elections %} <div class="card shadow mb-2"> <div class="card-header"> <h4>Open Elections</h4> diff --git a/vote/templates/vote/spectator.html b/vote/templates/vote/spectator.html index a77fc3da78d963de9cf2062454e64a5e2458714d..79c2085d9d57427dcd99272d3eda36d2015c9830 100644 --- a/vote/templates/vote/spectator.html +++ b/vote/templates/vote/spectator.html @@ -15,7 +15,11 @@ </div> </div> <div id="electionCard"> - {% if open_elections %} + {% if not existing_elections %} + <div class="list-group-item mt-3"> + <span>There are no elections for this session</span> + </div> + {% elif open_elections %} <div class="card shadow mb-2"> <div class="card-header"> <h4>Open Elections</h4> diff --git a/vote/views.py b/vote/views.py index 315d9b96dc5fc52e6cfaf86173f90f989192f68a..d5774cb2014a329ded6f16d726bf6b3880ee7e2a 100644 --- a/vote/views.py +++ b/vote/views.py @@ -71,6 +71,7 @@ def index(request): 'title': session.title, 'meeting_link': session.meeting_link, 'voter': voter, + 'existing_elections': (session.elections.count() > 0), 'open_elections': list_elections(open_elections(session)), 'upcoming_elections': list_elections(upcoming_elections(session)), 'published_elections': list_elections(published_elections(session)), @@ -172,6 +173,7 @@ def spectator(request, uuid): context = { 'title': session.title, 'meeting_link': session.meeting_link, + 'existing_elections': (session.elections.count() > 0), 'open_elections': open_elections(session), 'upcoming_elections': upcoming_elections(session), 'published_elections': published_elections(session),