diff --git a/openslides/application/views.py b/openslides/application/views.py index 3b28738c8..32499c316 100644 --- a/openslides/application/views.py +++ b/openslides/application/views.py @@ -320,16 +320,12 @@ def unsupport(request, application_id): @permission_required('application.can_manage_application') -@template('application/view.html') def set_active(request, application_id): - print application_id item = Item.objects.get(itemapplication__application__id=application_id) - print item.id item.set_active(False) -# if request.is_ajax(): -# return ajax_request({'active': item.id}) return redirect(reverse('application_view', args=[application_id])) + @permission_required('application.can_manage_application') @template('application/view.html') def gen_poll(request, application_id): diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html index 63d023cd7..4d31dd032 100644 --- a/openslides/assignment/templates/assignment/view.html +++ b/openslides/assignment/templates/assignment/view.html @@ -41,6 +41,13 @@ {%trans 'New agenda item' %} + {% else %} +
+ + + {% endif %} {% endif %} diff --git a/openslides/assignment/urls.py b/openslides/assignment/urls.py index 8cef45fb6..72f6ea12c 100644 --- a/openslides/assignment/urls.py +++ b/openslides/assignment/urls.py @@ -40,6 +40,9 @@ urlpatterns = patterns('assignment.views', url(r'^assignment/(?P