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

Minor fixes.

Browse Source
This commit is contained in:
Emanuel Schuetze 2012-04-14 19:14:51 +02:00
parent aea3b5803a
commit 09d2c3112d
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/application/templates/application/view.html
View File

@ -49,7 +49,7 @@
<h4>{% trans "Vote results" %}:</h4> <h4>{% trans "Vote results" %}:</h4>
{% with application.polls as polls %} {% with application.polls as polls %}
{% if polls.exists %} {% if not polls.exists %}
{% if perms.application.can_manage_application %} {% if perms.application.can_manage_application %}
{% if "genpoll" in actions %} {% if "genpoll" in actions %}
<a href='{% url application_gen_poll application.id %}'> <a href='{% url application_gen_poll application.id %}'>

5
openslides/application/views.py
View File

@ -391,7 +391,7 @@ def view_poll(request, poll_id):
view a poll for this application. view a poll for this application.
""" """
poll = ApplicationPoll.objects.get(pk=poll_id) poll = ApplicationPoll.objects.get(pk=poll_id)
#ballot = poll.ballot ballot = poll.ballot
options = poll.get_options() options = poll.get_options()
if request.user.has_perm('application.can_manage_application'): if request.user.has_perm('application.can_manage_application'):
if request.method == 'POST': if request.method == 'POST':
@ -425,7 +425,7 @@ def view_poll(request, poll_id):
'poll': poll, 'poll': poll,
'form': form, 'form': form,
'options': options, 'options': options,
#'ballot': ballot, 'ballot': ballot,
} }
@ -608,7 +608,6 @@ class ApplicationPDF(PDFView):
permission_required = 'application.can_manage_application' permission_required = 'application.can_manage_application'
filename = u'filename=%s.pdf;' % _("Applications") filename = u'filename=%s.pdf;' % _("Applications")
top_space = 0 top_space = 0
document_title = ''
def append_to_pdf(self, story): def append_to_pdf(self, story):
try: try:

1
openslides/assignment/views.py
View File

@ -287,7 +287,6 @@ class AssignmentPDF(PDFView):
permission_required = 'assignment.can_manage_assignment' permission_required = 'assignment.can_manage_assignment'
filename = u'filename=%s.pdf;' % _("Elections") filename = u'filename=%s.pdf;' % _("Elections")
top_space = 0 top_space = 0
document_title = None
def append_to_pdf(self, story): def append_to_pdf(self, story):
try: try: