From d69e5a246bd41211004876df2368cda79475c6a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Wed, 21 Nov 2012 13:41:16 +0100 Subject: [PATCH 1/5] Fix urls.py - Redirect from / to the dahsboard --- openslides/urls.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openslides/urls.py b/openslides/urls.py index 106a3dca7..509fea41c 100644 --- a/openslides/urls.py +++ b/openslides/urls.py @@ -13,7 +13,6 @@ from django.conf import settings from django.conf.urls.defaults import patterns, url, include from django.contrib.staticfiles.urls import staticfiles_urlpatterns -from django.core.urlresolvers import reverse_lazy from django.shortcuts import redirect from django.utils.importlib import import_module @@ -23,7 +22,7 @@ handler500 = 'openslides.utils.views.server_error' urlpatterns = patterns('', # Redirect to dashboard URL - url(r'^$', RedirectView.as_view(url=reverse_lazy('dashboard')), name='home',), + url(r'^$', RedirectView.as_view(url='dashboard'), name='home',), (r'^agenda/', include('openslides.agenda.urls')), (r'^motion/', include('openslides.motion.urls')), From 5939b9877292e2cad7d33c90f6940f744f472a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Wed, 21 Nov 2012 14:07:14 +0100 Subject: [PATCH 2/5] Use join for group list in UserSlide.html --- openslides/participant/templates/projector/UserSlide.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openslides/participant/templates/projector/UserSlide.html b/openslides/participant/templates/projector/UserSlide.html index 3c38a273b..dd845e2b9 100644 --- a/openslides/participant/templates/projector/UserSlide.html +++ b/openslides/participant/templates/projector/UserSlide.html @@ -10,11 +10,11 @@