{{ user.first_name }} |
{{ user.last_name }} |
- {{ user.category }} |
+ {{ user.detail }} |
{{ user.get_type_display }} |
{{ user.committee }} |
{% if perms.participant.can_manage_participant %}
diff --git a/openslides/participant/tests.py b/openslides/participant/tests.py
index 8418e994d..43db62492 100644
--- a/openslides/participant/tests.py
+++ b/openslides/participant/tests.py
@@ -35,12 +35,12 @@ class UserTest(TestCase):
self.assertEqual(self.django_user1, self.user1.django_user)
def test_repr(self):
- self.assertEqual(unicode(self.user1), u'Max Mustermann')
+ self.assertEqual(unicode(self.user1), 'Max Mustermann')
def test_name_surfix(self):
- self.user1.category = u'München'
+ self.user1.detail = 'München'
self.user1.save()
- self.assertEqual(unicode(self.user1), u'Max Mustermann (München)')
+ self.assertEqual(unicode(self.user1), 'Max Mustermann (München)')
def test_reset_password(self):
self.assertIsInstance(self.user1.default_password, basestring)
diff --git a/openslides/participant/views.py b/openslides/participant/views.py
index 63d70f77b..8c49d6eee 100644
--- a/openslides/participant/views.py
+++ b/openslides/participant/views.py
@@ -66,8 +66,8 @@ class Overview(ListView):
except KeyError:
sortfilter = {}
- for value in [u'gender', u'category', u'type', u'committee', u'status',
- u'sort', u'reverse']:
+ for value in ['gender', 'detail', 'type', 'committee', 'status',
+ 'sort', 'reverse']:
if value in self.request.REQUEST:
if self.request.REQUEST[value] == '---':
try:
@@ -80,8 +80,8 @@ class Overview(ListView):
query = User.objects
if 'gender' in sortfilter:
query = query.filter(gender__iexact=sortfilter['gender'][0])
- if 'category' in sortfilter:
- query = query.filter(category__iexact=sortfilter['category'][0])
+ if 'detail' in sortfilter:
+ query = query.filter(detail__iexact=sortfilter['detail'][0])
if 'type' in sortfilter:
query = query.filter(type__iexact=sortfilter['type'][0])
if 'committee' in sortfilter:
@@ -92,7 +92,7 @@ class Overview(ListView):
if sortfilter['sort'][0] in ['first_name', 'last_name', 'last_login']:
query = query.order_by(sortfilter['sort'][0])
elif (sortfilter['sort'][0] in
- ['category', 'type', 'committee', 'comment']):
+ ['detail', 'type', 'committee', 'comment']):
query = query.order_by(
'%s' % sortfilter['sort'][0])
else:
@@ -118,8 +118,8 @@ class Overview(ListView):
percent = 0
# list of all existing categories
- categories = [p['category'] for p in User.objects.values('category')
- .exclude(category='').distinct()]
+ details = [p['detail'] for p in User.objects.values('detail')
+ .exclude(detail='').distinct()]
# list of all existing committees
committees = [p['committee'] for p in User.objects.values('committee')
@@ -127,7 +127,7 @@ class Overview(ListView):
context.update({
'allusers': all_users,
'percent': round(percent, 1),
- 'categories': categories,
+ 'details': details,
'committees': committees,
'cookie': ['participant_sortfilter', urlencode(decodedict(self.sortfilter),
doseq=True)],
@@ -223,7 +223,7 @@ class ParticipantsListPDF(PDFView):
counter,
Paragraph(user.last_name, stylesheet['Tablecell']),
Paragraph(user.first_name, stylesheet['Tablecell']),
- Paragraph(user.category, stylesheet['Tablecell']),
+ Paragraph(user.detail, stylesheet['Tablecell']),
Paragraph(user.type, stylesheet['Tablecell']),
Paragraph(user.committee, stylesheet['Tablecell'])])
t = LongTable(data, style=[