diff --git a/openslides/application/views.py b/openslides/application/views.py index 680da866c..14fdb57cd 100644 --- a/openslides/application/views.py +++ b/openslides/application/views.py @@ -323,7 +323,7 @@ def view_poll(request, poll_id): if request.method == 'POST': form = PollInvalidForm(request.POST, prefix="poll") if form.is_valid(): - poll.voteinvalid = form.cleaned_data['invalid'] or 0 + poll.votesinvalid = form.cleaned_data['invalid'] or 0 poll.save() for option in options: @@ -336,7 +336,7 @@ def view_poll(request, poll_id): cleaned_data['undesided'] or 0 option.save() else: - form = PollInvalidForm(initial={'invalid': poll.voteinvalid}, prefix="poll") + form = PollInvalidForm(initial={'invalid': poll.votesinvalid}, prefix="poll") for option in options: option.form = OptionResultForm(initial={ 'yes': option.voteyes, diff --git a/openslides/assignment/templates/assignment/poll_view.html b/openslides/assignment/templates/assignment/poll_view.html index 111a1b81d..9ddde0f45 100644 --- a/openslides/assignment/templates/assignment/poll_view.html +++ b/openslides/assignment/templates/assignment/poll_view.html @@ -33,7 +33,7 @@ {% endfor %} - + {{ form.invalid.errors }}{{ form.invalid }} {% if perms.poll.can_manage_poll %} diff --git a/openslides/assignment/views.py b/openslides/assignment/views.py index f441c42e0..ff0891dd7 100644 --- a/openslides/assignment/views.py +++ b/openslides/assignment/views.py @@ -199,7 +199,7 @@ def poll_view(request, poll_id, ballotnumber=1): if request.method == 'POST': form = PollInvalidForm(request.POST, prefix="poll") if form.is_valid(): - poll.voteinvalid = form.cleaned_data['invalid'] or 0 + poll.votesinvalid = form.cleaned_data['invalid'] or 0 poll.save() success = 0 @@ -214,7 +214,7 @@ def poll_view(request, poll_id, ballotnumber=1): if success == options.count(): messages.success(request, _("Votes are successfully saved.") ) else: - form = PollInvalidForm(initial={'invalid': poll.voteinvalid}, prefix="poll") + form = PollInvalidForm(initial={'invalid': poll.votesinvalid}, prefix="poll") for option in options: option.form = OptionResultForm(initial={ 'yes': option.voteyes, diff --git a/openslides/poll/models.py b/openslides/poll/models.py index 223f5bc26..05e11cf3b 100644 --- a/openslides/poll/models.py +++ b/openslides/poll/models.py @@ -26,7 +26,7 @@ class Poll(models.Model): assignment = models.ForeignKey(Assignment, null=True, blank=True, verbose_name = _("Election")) description = models.TextField(null=True, blank=True, verbose_name = _("Description")) votescast = models.IntegerField(null=True, blank=True, verbose_name = _("Votes cast")) - voteinvalid = models.IntegerField(null=True, blank=True, verbose_name = _("Votes invalid")) + votesinvalid = models.IntegerField(null=True, blank=True, verbose_name = _("Votes invalid")) def add_option(self, option): self.save()