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

Automated merge with ssh://openslides.org/openslides

Browse Source
This commit is contained in:
Emanuel Schuetze 2012-04-14 17:50:48 +02:00
commit 50df804010
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openslides/application/models.py
View File

@ -528,6 +528,9 @@ class ApplicationPoll(BasePoll, CountInvalid, CountVotesCast):
def get_absolute_url(self): def get_absolute_url(self):
return reverse('application_poll_view', args=[self.id]) return reverse('application_poll_view', args=[self.id])
def ballot(self):
return self.application.applicationpoll_set.filter(id__lte=self.id).count()
from django.dispatch import receiver from django.dispatch import receiver
from openslides.config.signals import default_config_value from openslides.config.signals import default_config_value

2
openslides/application/templates/application/view.html
View File

@ -49,7 +49,7 @@
<h4>{% trans "Vote results" %}:</h4> <h4>{% trans "Vote results" %}:</h4>
{% with application.polls as polls %} {% with application.polls as polls %}
{% if polls|length == 0 %} {% if polls.exists %}
{% if perms.application.can_manage_application %} {% if perms.application.can_manage_application %}
{% if "genpoll" in actions %} {% if "genpoll" in actions %}
<a href='{% url application_gen_poll application.id %}'> <a href='{% url application_gen_poll application.id %}'>

3
openslides/assignment/models.py
View File

@ -143,6 +143,9 @@ class AssignmentPoll(BasePoll, CountInvalid, CountVotesCast, PublishPollMixin):
CountInvalid.append_pollform_fields(self, fields) CountInvalid.append_pollform_fields(self, fields)
CountVotesCast.append_pollform_fields(self, fields) CountVotesCast.append_pollform_fields(self, fields)
def ballot(self):
return self.assignment.assignmentpoll_set.filter(id__lte=self.id).count()
@models.permalink @models.permalink
def get_absolute_url(self, link='view'): def get_absolute_url(self, link='view'):
if link == 'view': if link == 'view':