From 7fc12e51f94515ddb69669044144556ffd0e431f Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Fri, 9 Sep 2011 16:26:34 +0200
Subject: [PATCH] type in last commit, template update, form update

info in template, that -1 is majority and -2 in undocumentet

update option_form. -2 is a valide value
---
 openslides/assignment/templates/assignment/poll_view.html | 5 +++--
 openslides/poll/forms.py                                  | 6 +++---
 openslides/poll/models.py                                 | 6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/openslides/assignment/templates/assignment/poll_view.html b/openslides/assignment/templates/assignment/poll_view.html
index 33f6bd871..10bdb38a3 100644
--- a/openslides/assignment/templates/assignment/poll_view.html
+++ b/openslides/assignment/templates/assignment/poll_view.html
@@ -7,6 +7,7 @@
     {% blocktrans count counter=options|length %}candidate{% plural %}candidates{% endblocktrans %}
     </p>
     <p><b>{% trans "Short description" %}:</b> {{ poll.description }}</p>
+    <i>-1 := {% trans 'majority' %}, -2 := {% trans 'undocumented' %}</i>
     <form action="" method="post">{% csrf_token %}
     <table class="table" style="width:auto;">
         <tr>
@@ -41,7 +42,7 @@
         </tr>
     </table>
 
-   
+
         <p>
         <a href='{% url print_assignment_poll poll.id %}'>
             <button type="button">
@@ -49,7 +50,7 @@
             </button>
         </a>
         </p>
-        
+
         <p>
         <button type="submit">
             <span class="icon ok">{%trans 'Save' %}</span>
diff --git a/openslides/poll/forms.py b/openslides/poll/forms.py
index dfa872f99..1b1507703 100644
--- a/openslides/poll/forms.py
+++ b/openslides/poll/forms.py
@@ -42,6 +42,6 @@ class OptionResultForm(Form):
     error_css_class = 'error'
     required_css_class = 'required'
 
-    yes = IntegerField(min_value=-1, widget=TextInput(attrs={'class': 'small-input'}), label=_("Yes"))
-    no = IntegerField(min_value=-1, required=False, widget=TextInput(attrs={'class': 'small-input'}), label=_("No"))
-    undesided = IntegerField(min_value=-1, required=False, widget=TextInput(attrs={'class': 'small-input'}), label=_("Abstention"))
+    yes = IntegerField(min_value=-2, widget=TextInput(attrs={'class': 'small-input'}), label=_("Yes"))
+    no = IntegerField(min_value=-2, required=False, widget=TextInput(attrs={'class': 'small-input'}), label=_("No"))
+    undesided = IntegerField(min_value=-2, required=False, widget=TextInput(attrs={'class': 'small-input'}), label=_("Abstention"))
diff --git a/openslides/poll/models.py b/openslides/poll/models.py
index 735cf51dc..ab5300a9d 100644
--- a/openslides/poll/models.py
+++ b/openslides/poll/models.py
@@ -125,7 +125,7 @@ class Option(models.Model):
     def yes(self):
         if self.voteyes == -1:
             return _('majority')
-        if self.voteno == -2:
+        if self.voteyes == -2:
             return _('undocumented')
         if self.voteyes:
             return self.voteyes
@@ -145,7 +145,7 @@ class Option(models.Model):
     def undesided(self):
         if self.voteundesided == -1:
             return _('majority')
-        if self.voteno == -2:
+        if self.voteundesided == -2:
             return _('undocumented')
         if self.voteundesided:
             return self.voteundesided
@@ -163,5 +163,5 @@ class Option(models.Model):
 
     def __unicode__(self):
         if self.value:
-            return self.value
+            return unicode(self.value)
         return _("No options")