diff --git a/openslides/assignment/views.py b/openslides/assignment/views.py
index 324ecb79c..96a37bb14 100644
--- a/openslides/assignment/views.py
+++ b/openslides/assignment/views.py
@@ -412,7 +412,7 @@ class AssignmentPDF(PDFView):
# Add result rows
- elected_candidates = assignment.elected.all()
+ elected_candidates = list(assignment.elected)
for candidate, poll_list in vote_results.iteritems():
row = []
diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html
index dadbb48df..f068dd69c 100644
--- a/openslides/participant/templates/participant/overview.html
+++ b/openslides/participant/templates/participant/overview.html
@@ -77,11 +77,11 @@
{{ user.first_name }} |
{{ user.last_name }} |
- {{ user.profile.group }} |
- {{ user.profile.get_type_display }} |
- {{ user.profile.committee }} |
+ {{ user.openslidesuser.name_surfix }} |
+ {{ user.openslidesuser.get_type_display }} |
+ {{ user.openslidesuser.committee }} |
{% if perms.participant.can_manage_participant %}
- {{ user.profile.comment|first_line }} |
+ {{ user.openslidesuser.comment|first_line }} |
{% if user.last_login > user.date_joined %}
{{ user.last_login }}
{% endif %} |
diff --git a/openslides/participant/views.py b/openslides/participant/views.py
index 728965c55..3fd5f6a55 100644
--- a/openslides/participant/views.py
+++ b/openslides/participant/views.py
@@ -83,7 +83,7 @@ def get_overview(request):
openslidesuser__gender__iexact=sortfilter['gender'][0])
if 'group' in sortfilter:
query = query.filter(
- openslidesuser__group__iexact=sortfilter['name_surfix'][0])
+ openslidesuser__name_surfix__iexact=sortfilter['group'][0])
if 'type' in sortfilter:
query = query.filter(
openslidesuser__type__iexact=sortfilter['type'][0])
@@ -315,11 +315,11 @@ def group_edit(request, group_id=None):
group = form.save()
try:
- django_group = DjangoGroup.objects.get(group=group)
- except DjangoGroup.DoesNotExist:
+ openslides_group = OpenSlidesGroup.objects.get(group=group)
+ except OpenSlidesGroup.DoesNotExist:
django_group = None
if form.cleaned_data['as_user'] and django_group is None:
- DjangoGroup(group=group).save()
+ OpenSlidesGroup(group=group).save()
elif not form.cleaned_data['as_user'] and django_group:
django_group.delete()