diff --git a/app/groups/models.py b/app/groups/models.py index 271f4a6..a0abfb2 100644 --- a/app/groups/models.py +++ b/app/groups/models.py @@ -50,6 +50,14 @@ class GroupRequest(models.Model): created_date = models.DateTimeField("Created Date/Time", auto_now_add=True) + @property + def character(self): + char = self.user.get_profile().primary_character + if char: + return "[%s]%s" % (char.corporation.ticker, char.name) + else: + return "Unknown" + def __unicode__(self): return u'%s - %s' % (self.user, self.group) diff --git a/app/groups/templates/groups/group_admin.html b/app/groups/templates/groups/group_admin.html index ef0b38c..c3648a5 100644 --- a/app/groups/templates/groups/group_admin.html +++ b/app/groups/templates/groups/group_admin.html @@ -8,7 +8,7 @@ {% if group.user_set.all %} - + {% for user, chars, status in member_list %} @@ -26,9 +26,10 @@ {% if requests %}
Member UsernameCharactersStatusActions
Member UsernameCharacterStatusActions
{{ user.username }} {{ chars }}
- + {% for req in requests %} + diff --git a/app/groups/views.py b/app/groups/views.py index 1488197..a397404 100644 --- a/app/groups/views.py +++ b/app/groups/views.py @@ -134,11 +134,13 @@ def admin_group(request, groupid): else: status = "Member" - chars = [] - for acc in member.eveaccount_set.all(): - chars.extend(acc.characters.all().values_list('name', flat=True)) + char = member.get_profile().primary_character + if char: + charname = "[%s]%s" % char.corporation.ticker, char.name + else: + charname = "Unknown" - member_list.append((member, ', '.join(chars), status)) + member_list.append((member, charname, status)) requests = group.requests.filter(status=REQUEST_PENDING) return render_to_response('groups/group_admin.html', locals(), context_instance=RequestContext(request))
UsernameReasonStatusCreated DateActions
UsernameCharacterReasonStatusCreated DateActions
{{ req.user }}{{ req.character }} {{ req.reason }} {{ req.get_status_description }} {{ req.created_date }}