Changeset ce5d021

Timestamp:

Feb 26, 2012, 2:28:25 AM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

41f8b1e

Parents:

fb76571

git-author:

Alex Dehnert <adehnert@…> (02/26/12 02:28:25)

git-committer:

Alex Dehnert <adehnert@…> (02/26/12 02:28:25)

Message:

Handle non-existent users on people page (Trac: #69)

Fixes a 500 when people try to modify signatories where one or more
of the involved people in the group no longer has a valid Athena account.

File:

• asadb/groups/views.py (modified) (3 diffs)

asadb/groups/views.py

@@ -652 +652 @@
                     if person in new_holders:
                         if (person, role) in officers_map:
-                            if role.require_student and not moira_accounts[person].is_student():
+                            if person not in moira_accounts:
+                                pass # already errored above
+                            elif role.require_student and not moira_accounts[person].is_student():
                                 msgs.append('Only students can have the %s role, and %s does not appear to be a student. (If this is not the case, please contact us.) You should replace this person ASAP.' % (role, person, ))
                             #changes.append(("Kept", "yellow", person, role))
@@ -658 +660 @@
                         else:
                             if person not in moira_accounts:
-                                msgs.append('Could not add nonexistent Athena account "%s" as %s.' % (person, role, ))
+                                pass # already errored above
                             elif role.require_student and not moira_accounts[person].is_student():
                                 msgs.append('Only students can have the %s role, and %s does not appear to be a student. (If this is not the case, please contact us.)' % (role, person, ))
@@ -676 +678 @@
                         if i in new_people:
                             person = new_people[i]
+                            assert person in moira_accounts
                             if role.require_student and not moira_accounts[person].is_student():
                                 msgs.append('Only students can have the %s role, and %s does not appear to be a student.' % (role, person, ))