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

type in last commit, template update, form update

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

update option_form. -2 is a valide value
This commit is contained in:
Oskar Hahn 2011-09-09 16:26:34 +02:00
parent 7be90c89c7
commit 7fc12e51f9
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openslides/assignment/templates/assignment/poll_view.html
View File

@ -7,6 +7,7 @@
{% blocktrans count counter=options|length %}candidate{% plural %}candidates{% endblocktrans %} {% blocktrans count counter=options|length %}candidate{% plural %}candidates{% endblocktrans %}
</p> </p>
<p><b>{% trans "Short description" %}:</b> {{ poll.description }}</p> <p><b>{% trans "Short description" %}:</b> {{ poll.description }}</p>
<i>-1 := {% trans 'majority' %}, -2 := {% trans 'undocumented' %}</i>
<form action="" method="post">{% csrf_token %} <form action="" method="post">{% csrf_token %}
<table class="table" style="width:auto;"> <table class="table" style="width:auto;">
<tr> <tr>
@ -41,7 +42,7 @@
</tr> </tr>
</table> </table>
<p> <p>
<a href='{% url print_assignment_poll poll.id %}'> <a href='{% url print_assignment_poll poll.id %}'>
<button type="button"> <button type="button">
@ -49,7 +50,7 @@
</button> </button>
</a> </a>
</p> </p>
<p> <p>
<button type="submit"> <button type="submit">
<span class="icon ok">{%trans 'Save' %}</span> <span class="icon ok">{%trans 'Save' %}</span>

6
openslides/poll/forms.py
View File

@ -42,6 +42,6 @@ class OptionResultForm(Form):
error_css_class = 'error' error_css_class = 'error'
required_css_class = 'required' required_css_class = 'required'
yes = IntegerField(min_value=-1, widget=TextInput(attrs={'class': 'small-input'}), label=_("Yes")) yes = IntegerField(min_value=-2, widget=TextInput(attrs={'class': 'small-input'}), label=_("Yes"))
no = IntegerField(min_value=-1, required=False, widget=TextInput(attrs={'class': 'small-input'}), label=_("No")) no = IntegerField(min_value=-2, 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")) undesided = IntegerField(min_value=-2, required=False, widget=TextInput(attrs={'class': 'small-input'}), label=_("Abstention"))

6
openslides/poll/models.py
View File

@ -125,7 +125,7 @@ class Option(models.Model):
def yes(self): def yes(self):
if self.voteyes == -1: if self.voteyes == -1:
return _('majority') return _('majority')
if self.voteno == -2: if self.voteyes == -2:
return _('undocumented') return _('undocumented')
if self.voteyes: if self.voteyes:
return self.voteyes return self.voteyes
@ -145,7 +145,7 @@ class Option(models.Model):
def undesided(self): def undesided(self):
if self.voteundesided == -1: if self.voteundesided == -1:
return _('majority') return _('majority')
if self.voteno == -2: if self.voteundesided == -2:
return _('undocumented') return _('undocumented')
if self.voteundesided: if self.voteundesided:
return self.voteundesided return self.voteundesided
@ -163,5 +163,5 @@ class Option(models.Model):
def __unicode__(self): def __unicode__(self):
if self.value: if self.value:
return self.value return unicode(self.value)
return _("No options") return _("No options")