Show primary character on group requests and lists

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)
 

app/groups/templates/groups/group_admin.html

@@ -8,7 +8,7 @@
 
 {% if group.user_set.all %}
 <table>
-<tr><th>Member Username</th><th>Characters</th><th>Status</th><th>Actions</th></tr>
+<tr><th>Member Username</th><th>Character</th><th>Status</th><th>Actions</th></tr>
 {% for user, chars, status in member_list %}
 <tr><td><a href="{% url sso.views.user_view user.username %}">{{ user.username }}</a></td>
     <td>{{ chars }}</td>
@@ -26,9 +26,10 @@
 
 {% if requests %}
 <table>
-<tr><th>Username</th><th>Reason</th><th>Status</th><th>Created Date</th><th>Actions</th></tr>
+<tr><th>Username</th><th>Character</th><th>Reason</th><th>Status</th><th>Created Date</th><th>Actions</th></tr>
 {% for req in requests %}
 <tr><td><a href="{% url sso.views.user_view req.user.username %}">{{ req.user }}</a></td>
+    <td>{{ req.character }}</td>
     <td>{{ req.reason }}</td>
     <td>{{ req.get_status_description }}</td>
     <td>{{ req.created_date }}</td>

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))