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 2011-09-09 16:34:33 +02:00
commit 9de5e25ae1
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
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>

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"))

14
openslides/poll/models.py
View File

@ -125,6 +125,8 @@ class Option(models.Model):
def yes(self): def yes(self):
if self.voteyes == -1: if self.voteyes == -1:
return _('majority') return _('majority')
if self.voteyes == -2:
return _('undocumented')
if self.voteyes: if self.voteyes:
return self.voteyes return self.voteyes
return '0' return '0'
@ -133,6 +135,8 @@ class Option(models.Model):
def no(self): def no(self):
if self.voteno == -1: if self.voteno == -1:
return _('majority') return _('majority')
if self.voteno == -2:
return _('undocumented')
if self.voteno: if self.voteno:
return self.voteno return self.voteno
return '0' return '0'
@ -141,6 +145,8 @@ class Option(models.Model):
def undesided(self): def undesided(self):
if self.voteundesided == -1: if self.voteundesided == -1:
return _('majority') return _('majority')
if self.voteundesided == -2:
return _('undocumented')
if self.voteundesided: if self.voteundesided:
return self.voteundesided return self.voteundesided
return '0' return '0'
@ -156,10 +162,6 @@ class Option(models.Model):
return None return None
def __unicode__(self): def __unicode__(self):
if self.text != "" and self.text is not None: if self.value:
return self.text return unicode(self.value)
if self.user is not None:
return unicode(self.user)
if self.application is not None:
return unicode(self.application)
return _("No options") return _("No options")