From 0ec106a0340cf8c761fbca2bb0c091c6bd98a262 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Thu, 25 Oct 2012 22:18:20 +0200 Subject: [PATCH] Fix message on assignment slide, ticket #389 --- openslides/assignment/models.py | 1 + openslides/assignment/templates/projector/Assignment.html | 2 ++ 2 files changed, 3 insertions(+) diff --git a/openslides/assignment/models.py b/openslides/assignment/models.py index af67411a6..9d2cf8814 100644 --- a/openslides/assignment/models.py +++ b/openslides/assignment/models.py @@ -230,6 +230,7 @@ class Assignment(models.Model, SlideMixin): data = super(Assignment, self).slide() data['assignment'] = self data['title'] = self.name + data['polls_available'] = self.poll_set.exists() data['polls'] = self.poll_set.filter(published=True) data['vote_results'] = self.vote_results(only_published=True) data['assignment_publish_winner_results_only'] = \ diff --git a/openslides/assignment/templates/projector/Assignment.html b/openslides/assignment/templates/projector/Assignment.html index 8a5c50b0e..181597a9f 100644 --- a/openslides/assignment/templates/projector/Assignment.html +++ b/openslides/assignment/templates/projector/Assignment.html @@ -122,6 +122,8 @@ + {% elif polls_available %} + {% trans "Vote results are not published yet." %} {% elif assignment.candidates %} {% trans "No ballots available." %} {% endif %}