summaryrefslogtreecommitdiff
path: root/papillon/polls
diff options
context:
space:
mode:
authorÉtienne Loks2011-10-25 01:13:25 +0200
committerÉtienne Loks2011-10-25 01:13:25 +0200
commit023f8571e1386a08e25d779252c221ca939d1f1d (patch)
treefb438eab21ff42eb026201cb130b77898d2ddf90 /papillon/polls
parent229e7616b16ee1f316b9a9ab5442631ff5033668 (diff)
Allow disabling frontpage polls (closes #311)
Diffstat (limited to 'papillon/polls')
-rw-r--r--papillon/polls/forms.py4
-rw-r--r--papillon/polls/views.py6
2 files changed, 7 insertions, 3 deletions
diff --git a/papillon/polls/forms.py b/papillon/polls/forms.py
index 3a151aa..2e9b75d 100644
--- a/papillon/polls/forms.py
+++ b/papillon/polls/forms.py
@@ -28,7 +28,7 @@ from django.contrib.admin import widgets as adminwidgets
from django.utils.translation import gettext_lazy as _
from papillon.polls.models import Poll, Category, Choice, Comment
-from papillon import settings
+from django.conf import settings
class TextareaWidget(forms.Textarea):
"""
@@ -73,6 +73,8 @@ class AdminPollForm(PollForm):
'dated_choices', 'type']
if not Category.objects.all():
exclude.append('category')
+ if not settings.ALLOW_FRONTPAGE_POLL:
+ exclude.append('public')
enddate = SplitDateTimeJSField(widget=adminwidgets.AdminSplitDateTime(),
required=False, label=Poll._meta.get_field('enddate').verbose_name,
help_text=Poll._meta.get_field('enddate').help_text)
diff --git a/papillon/polls/views.py b/papillon/polls/views.py
index 1022f58..26b3b34 100644
--- a/papillon/polls/views.py
+++ b/papillon/polls/views.py
@@ -58,8 +58,10 @@ def index(request):
response_dct, redirect = getBaseResponse(request)
if redirect:
return redirect
- response_dct['polls'] = Poll.objects.filter(public=True, category=None)
- response_dct['categories'] = Category.objects.all()
+ response_dct['public'] = settings.ALLOW_FRONTPAGE_POLL
+ if response_dct['public']:
+ response_dct['polls'] = Poll.objects.filter(public=True, category=None)
+ response_dct['categories'] = Category.objects.all()
error = ''
if 'bad_poll' in request.GET:
response_dct['error'] = _("The poll requested don't exist (anymore?)")