From fbc603b748dd5e6d1c158763c88e07827a2694a1 Mon Sep 17 00:00:00 2001 From: Andy Kittner Date: Sat, 19 May 2012 14:19:32 +0200 Subject: [PATCH] Fix initial value for pollform is value is a "special" value (#135) --- openslides/poll/forms.py | 2 +- openslides/poll/models.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/openslides/poll/forms.py b/openslides/poll/forms.py index 8c7975682..3fb3749a6 100644 --- a/openslides/poll/forms.py +++ b/openslides/poll/forms.py @@ -28,7 +28,7 @@ class OptionForm(forms.Form, CssClassMixin): if type(vote) is Vote: key = vote.value value = vote.get_value() - weight = vote.get_weight() + weight = vote.get_weight(raw = True) else: key = vote value = _(vote) diff --git a/openslides/poll/models.py b/openslides/poll/models.py index 8be7df681..faa5c3aad 100644 --- a/openslides/poll/models.py +++ b/openslides/poll/models.py @@ -36,7 +36,9 @@ class Vote(models.Model): weight = models.IntegerField(default=1) value = models.CharField(max_length=255, null=True) - def get_weight(self): + def get_weight(self, raw = False): + if raw: + return self.weight return print_value(self.weight) def get_value(self):