From d3d091d4dff94c099eb528978236eff183c03bf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lie=20Bouttier?= Date: Sun, 17 Aug 2014 10:34:25 -0700 Subject: [PATCH] clarify team list page --- issue/templates/issue/team_list.html | 10 +++------- issue/templatetags/issue_filters.py | 12 +++++++----- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/issue/templates/issue/team_list.html b/issue/templates/issue/team_list.html index 7c00f24..d95b6b2 100644 --- a/issue/templates/issue/team_list.html +++ b/issue/templates/issue/team_list.html @@ -22,19 +22,15 @@ {% if teams.exists %} - - - + + + {% for team in teams %} - {% endfor %}
NameUsersGroupsNameUsersGroups
{{ team }} {{ team.users|first_few:'user' }} {{ team.groups|first_few:'group' }} - Edit - Delete -
diff --git a/issue/templatetags/issue_filters.py b/issue/templatetags/issue_filters.py index 5f2463b..68457e2 100644 --- a/issue/templatetags/issue_filters.py +++ b/issue/templatetags/issue_filters.py @@ -15,14 +15,16 @@ def boolean(value): + glyph + '" style="vertical-align: middle;">') @register.filter -def first_few(items, arg='item'): +def first_few(items, arg='item', max_items=5): if items.exists(): - if items.count() < 4: + if items.count() <= max_items: return ', '.join(map(lambda x: x.__str__(), items.all())) else: - r = ', '.join(map(lambda x: x.__str__(), items.all()[0:3])) - plural = 's' if items.count() > 4 else '' - r += ', ... (%s other%s)' % (items.count() - 3, plural) + r = ', '.join(map(lambda x: x.__str__(), + items.all()[0:max_items-1])) + plural = 's' if items.count() > max_items else '' + r += ', ... (%s other%s)' \ + % (items.count() - max_items + 1, plural) return r else: return 'no ' + arg + 's'