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/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 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')] 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 @@

{% trans "Groups" %}

- {% 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 %}

{% if shown_user.get_gender_display %} 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 @@