diff --git a/openslides/application/templates/application/view.html b/openslides/application/templates/application/view.html index 2d4eefc3c..66e80b0ac 100644 --- a/openslides/application/templates/application/view.html +++ b/openslides/application/templates/application/view.html @@ -72,6 +72,8 @@ + {% elif poll.has_votes %} + {{ forloop.counter }}. {% trans "Vote" %}: {% endif %}
{% if poll.has_votes %} diff --git a/openslides/application/views.py b/openslides/application/views.py index b562550c4..8aaa0423f 100644 --- a/openslides/application/views.py +++ b/openslides/application/views.py @@ -681,7 +681,6 @@ class ApplicationPDF(PDFView): data.append([cell3a,cell3b]) poll_results = application.get_poll_results() - print poll_results # voting results if poll_results: cell4a = [] diff --git a/openslides/utils/views.py b/openslides/utils/views.py index bdfc78e3f..41ae11990 100644 --- a/openslides/utils/views.py +++ b/openslides/utils/views.py @@ -52,8 +52,8 @@ import settings from utils import render_to_forbitten from openslides.utils.signals import template_manipulation from pdf import firstPage, laterPages +from config.models import config -import settings NO_PERMISSION_REQUIRED = 'No permission required' @@ -276,10 +276,9 @@ class FrontPage(TemplateView): tab = mod.register_tab(self.request) except (ImportError, AttributeError): continue - if self.request.user.has_perm(tab.permission): + if tab.permission: apps.append(tab) context['apps'] = apps - #context['wellcome_text'] = config['wellcome_text'] return context