From d69e5a246bd41211004876df2368cda79475c6a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Norman=20J=C3=A4ckel?= <my-git-mail@normanjaeckel.de>
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?= <my-git-mail@normanjaeckel.de>
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 @@
     <div id='sidebar'>
     <div class='box'>
         <p><strong>{% trans "Groups" %}</strong><br />
-            {% for group in shown_user.groups.all %}
-                {{ group }},
-            {% empty %}
+            {% if shown_user.groups.all %}
+                {{ shown_user.groups.all|join:", " }}
+            {% else %}
                 {% trans "The participant is not member of any group." %}
-            {% endfor %}
+            {% endif %}
         </p>
         {% if shown_user.get_gender_display %}
             <p><strong>{% trans "Gender" %}</strong><br />{{ shown_user.get_gender_display }}</p>

From 00e77ba0fc5864f409d6de45a57b7c784d7e521e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Norman=20J=C3=A4ckel?= <my-git-mail@normanjaeckel.de>
Date: Wed, 21 Nov 2012 14:09:47 +0100
Subject: [PATCH 3/5] Use join for the group list also in the participant view

---
 .../participant/templates/participant/user_detail.html    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/openslides/participant/templates/participant/user_detail.html b/openslides/participant/templates/participant/user_detail.html
index cf738c6b2..af3b581c3 100644
--- a/openslides/participant/templates/participant/user_detail.html
+++ b/openslides/participant/templates/participant/user_detail.html
@@ -13,11 +13,11 @@
 
 <h2>{% trans "Groups" %}</h2>
 <p>
-    {% for group in shown_user.groups.all %}
-        {{ group }},
-    {% empty %}
+    {% if shown_user.groups.all %}
+        {{ shown_user.groups.all|join:", " }}
+    {% else %}
         {% trans "The participant is not member of any group." %}
-    {% endfor %}
+    {% endif %}
 </p>
 
 {% if shown_user.get_gender_display %}

From 06af94fb910a5b25d142da793e79fc91edc822de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Norman=20J=C3=A4ckel?= <my-git-mail@normanjaeckel.de>
Date: Wed, 21 Nov 2012 15:03:29 +0100
Subject: [PATCH 4/5] Fix assignment poll choosing the right method
 (yes-no-abstain True or False)

---
 openslides/assignment/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openslides/assignment/models.py b/openslides/assignment/models.py
index 4b86b75cf..8c8019dda 100644
--- a/openslides/assignment/models.py
+++ b/openslides/assignment/models.py
@@ -293,7 +293,7 @@ class AssignmentPoll(BasePoll, CountInvalid, CountVotesCast, PublishPollMixin):
                 self.yesnoabstain = True
             else:
                 # candidates <= available posts -> yes/no/abstain
-                if self.assignment.assignment_candidats.filter(elected=False).count() <= (self.assignment.posts):
+                if len(self.assignment.candidates) <= (self.assignment.posts - len(self.assignment.elected)):
                     self.yesnoabstain = True
                 else:
                     self.yesnoabstain = False

From af6c40393605bf8c7889ca42ea0349fce59fcbd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Norman=20J=C3=A4ckel?= <my-git-mail@normanjaeckel.de>
Date: Wed, 21 Nov 2012 15:14:38 +0100
Subject: [PATCH 5/5] Fix perms for agenda, motion and assignment widget. It is
 now set to projector.can_manage_projector.

---
 openslides/agenda/views.py     | 2 +-
 openslides/assignment/views.py | 2 +-
 openslides/motion/views.py     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/openslides/agenda/views.py b/openslides/agenda/views.py
index b57128fbd..863bd9da4 100644
--- a/openslides/agenda/views.py
+++ b/openslides/agenda/views.py
@@ -231,4 +231,4 @@ def get_widgets(request):
             context={
                 'agenda': SLIDE['agenda'],
                 'items': Item.objects.all()},
-            permission_required='agenda.can_manage_agenda')]
+            permission_required='projector.can_manage_projector')]
diff --git a/openslides/assignment/views.py b/openslides/assignment/views.py
index fde043889..af661d072 100644
--- a/openslides/assignment/views.py
+++ b/openslides/assignment/views.py
@@ -678,4 +678,4 @@ def get_widgets(request):
             display_name=_('Elections'),
             template='assignment/widget.html',
             context={'assignments': Assignment.objects.all()},
-            permission_required='assignment.can_manage_assignment')]
+            permission_required='projector.can_manage_projector')]
diff --git a/openslides/motion/views.py b/openslides/motion/views.py
index f777ec7cf..c575b6ad2 100644
--- a/openslides/motion/views.py
+++ b/openslides/motion/views.py
@@ -928,4 +928,4 @@ def get_widgets(request):
             display_name=_('Motions'),
             template='motion/widget.html',
             context={'motions': Motion.objects.all()},
-            permission_required='motion.can_manage_motion')]
+            permission_required='projector.can_manage_projector')]