Changeset 0270ed7

Timestamp:

Feb 5, 2012, 8:14:25 PM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

dc81a9e

Parents:

927c824

git-author:

Alex Dehnert <adehnert@…> (02/05/12 20:14:25)

git-committer:

Alex Dehnert <adehnert@…> (02/05/12 20:14:25)

Message:

Display full names of signatories

This displays the full name of signatories (not just the username) in the
group display page and the signatory change page (but not the big list
signatories page). It also requires a database query per signatory being
looked up. (This is one reason for not doing it on the big list signatories
page, the other being that full names take more space.)

Location:

asadb

Files:

• groups/models.py (modified) (3 diffs)
• groups/views.py (modified) (4 diffs)
• template/groups/group_change_officers.html (modified) (2 diffs)
• template/groups/group_detail.html (modified) (1 diff)

asadb/groups/models.py

@@ -314 +314 @@
     current_holders = OfficeHolder_CurrentManager()
 
+    def format_person(self, ):
+        return AthenaMoiraAccount.try_format_by_username(self.person, )
+
     def expire(self, ):
         self.end_time = datetime.datetime.now()-self.EXPIRE_OFFSET
@@ -438 +441 @@
         return self.account_class == 'G' or self.account_class.isdigit()
 
+    def format(self, ):
+        return "%s %s <%s>" % (self.first_name, self.last_name, self.username, )
+
     def __str__(self, ):
         if self.mutable:
@@ -451 +457 @@
         return str(self)
 
+    @classmethod
+    def try_format_by_username(cls, username):
+        try:
+            moira = AthenaMoiraAccount.objects.get(username=username)
+            return moira.format()
+        except AthenaMoiraAccount.DoesNotExist:
+            return "%s (name not available)" % (username)
+
     class Meta:
         verbose_name = "Athena (Moira) account"

asadb/groups/views.py

@@ -595 +595 @@
     roles  = groups.models.OfficerRole.objects.all()
 
+    name_map = {}
+    for name in people:
+        name_map[name] = groups.models.AthenaMoiraAccount.try_format_by_username(name)
     officers_map = {}
+
     for officer in officers:
         officers_map[(officer.person, officer.role)] = officer
 
-    return people, roles, officers_map
+    return people, roles, name_map, officers_map
 
 def manage_officers(request, pk, ):
@@ -609 +613 @@
     max_new = 4
 
-    people, roles, officers_map = load_officers(group)
+    people, roles, name_map, officers_map = load_officers(group)
 
     msgs = []
@@ -683 +687 @@
             group.set_updater(request.user)
             group.save()
-        people, roles, officers_map = load_officers(group)
+        people, roles, name_map, officers_map = load_officers(group)
 
     officers_data = []
@@ -693 +697 @@
             else:
                 role_list.append((role, False))
-        officers_data.append((False, person, role_list))
+        officers_data.append((False, person, name_map[person], role_list))
     null_role_list = [(role, False) for role in roles]
     for i in range(max_new):
-        officers_data.append((True, "extra.%d" % (i, ), null_role_list))
+        officers_data.append((True, "extra.%d" % (i, ), "", null_role_list))
 
     context = {

asadb/template/groups/group_change_officers.html

@@ -68 +68 @@
 </thead>
 <tbody>
-{%for specify_name, person, role_list in officers %}
+{%for specify_name, person, formatted_name, role_list in officers %}
 <tr>
     <th>
@@ -74 +74 @@
         <input type='text' name='{{person}}' value=''>
         {% else %}
-        {{person}}
+        {{formatted_name}}
         {% endif %}
     </th>

asadb/template/groups/group_detail.html

@@ -33 +33 @@
     <th>{{name}}{%if not role.publicly_visible %}*{%endif%}</th>
     <td><ul>
-    {% for person in people %}<li>{{person.person}}</li>{%endfor%}
+    {% for person in people %}<li>{{person.format_person}}</li>{%endfor%}
     </ul></td>
 </tr>