ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix message on assignment slide, ticket #389

Browse Source
This commit is contained in:
Norman Jäckel 2012-10-25 22:18:20 +02:00
parent d6ebbdc541
commit 0ec106a034
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openslides/assignment/models.py
View File

@ -230,6 +230,7 @@ class Assignment(models.Model, SlideMixin):
data = super(Assignment, self).slide() data = super(Assignment, self).slide()
data['assignment'] = self data['assignment'] = self
data['title'] = self.name data['title'] = self.name
data['polls_available'] = self.poll_set.exists()
data['polls'] = self.poll_set.filter(published=True) data['polls'] = self.poll_set.filter(published=True)
data['vote_results'] = self.vote_results(only_published=True) data['vote_results'] = self.vote_results(only_published=True)
data['assignment_publish_winner_results_only'] = \ data['assignment_publish_winner_results_only'] = \

2
openslides/assignment/templates/projector/Assignment.html
View File

@ -122,6 +122,8 @@
</tr> </tr>
</table> </table>
{% elif polls_available %}
<i>{% trans "Vote results are not published yet." %}</i>
{% elif assignment.candidates %} {% elif assignment.candidates %}
<i>{% trans "No ballots available." %}</i> <i>{% trans "No ballots available." %}</i>
{% endif %} {% endif %}