diff --git a/openslides/application/templates/application/view.html b/openslides/application/templates/application/view.html index ab4fec528..8a8604030 100644 --- a/openslides/application/templates/application/view.html +++ b/openslides/application/templates/application/view.html @@ -73,7 +73,6 @@ {% if poll.has_vote %}{% endif %} {% endif %} - {% trans 'project' %}
{% if poll.has_votes %} {% with poll.get_options.0 as option %} diff --git a/openslides/application/urls.py b/openslides/application/urls.py index 88038cafd..dab384289 100644 --- a/openslides/application/urls.py +++ b/openslides/application/urls.py @@ -13,7 +13,7 @@ from django.conf.urls.defaults import * from django.utils.translation import ugettext as _ -from application.views import ViewPoll, ActivatePoll, ApplicationPDF, ApplicationPollPDF +from application.views import ViewPoll, ApplicationPDF, ApplicationPollPDF urlpatterns = patterns('application.views', url(r'^$', @@ -127,11 +127,6 @@ urlpatterns = patterns('application.views', name='application_poll_view', ), - url(r'^poll/(?P\d+)/activate/$', - ActivatePoll.as_view(), - name='application_poll_activate', - ), - url(r'^poll/(?P\d+)/del/$', 'delete_poll', name='application_poll_delete', diff --git a/openslides/application/views.py b/openslides/application/views.py index 5afcf2f95..4496fa8d9 100644 --- a/openslides/application/views.py +++ b/openslides/application/views.py @@ -445,20 +445,6 @@ class ViewPoll(PollFormView): return '' -class ActivatePoll(RedirectView): - permanent = False - - def get_redirect_url(self, **kwargs): - poll = ApplicationPoll.objects.get(pk=self.kwargs['poll_id']) - application = poll.get_application() - return reverse('application_view', args=[application.id]) - - def get(self, request, *args, **kwargs): - self.poll = ApplicationPoll.objects.get(pk=self.kwargs['poll_id']) - self.poll.set_active() - return super(ActivatePoll, self).get(request, *args, **kwargs) - - @permission_required('application.can_manage_application') def permit_version(request, aversion_id): aversion = AVersion.objects.get(pk=aversion_id)