diff options
Diffstat (limited to 'polls')
| -rw-r--r-- | polls/models.py | 4 | ||||
| -rw-r--r-- | polls/views.py | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/polls/models.py b/polls/models.py index cbecbd9..d76acaa 100644 --- a/polls/models.py +++ b/polls/models.py @@ -65,7 +65,7 @@ class Choice(models.Model): poll = models.ForeignKey(Poll) name = models.CharField(max_length=200) order = models.IntegerField() - limit = models.IntegerField(null=True) + limit = models.IntegerField(null=True, blank=True) available = models.BooleanField(default=True) class Admin: pass @@ -78,4 +78,4 @@ class Vote(models.Model): VOTE = ((1, (_('Yes'), _('Yes'))), (0, (_('No'), _('Maybe')), ), (-1, (_('No'), _('No'))),) - value = models.IntegerField(choices=VOTE, null=True) + value = models.IntegerField(choices=VOTE, blank=True) diff --git a/polls/views.py b/polls/views.py index e768e2b..11cad2e 100644 --- a/polls/views.py +++ b/polls/views.py @@ -46,7 +46,7 @@ def getBaseResponse(request): return None, HttpResponseRedirect(request.path) languages = [] for language_code, language_label in LANGUAGES: - languages.append((language_code, _(language_label))) + languages.append((language_code, language_label)) return {'root_url':url, 'languages':languages}, None def index(request): @@ -163,12 +163,16 @@ admin_url=admin_url, status = 'D', type=request.POST['poll_type']) choice = Choice(poll=poll, name=request.POST['new_choice'], order=order, limit=limit) choice.save() - # check if a choice has been choosen for deletion + # check if a choice has been choosen for deletion or for modification for key in request.POST: if key.startswith('delete_') and request.POST[key]: choice = Choice.objects.get(id=int(key[len('delete_'):])) Vote.objects.filter(choice=choice).delete() choice.delete() + if key.startswith('modify_') and request.POST[key]: + choice = Choice.objects.get(id=int(key[len('modify_'):])) + choice.name = request.POST[key] + choice.save() return response_dct, None response_dct, redirect = getBaseResponse(request) |