Changeset 89be44c

Timestamp:

Aug 5, 2011, 3:42:44 AM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage, test-hooks

Children:

7444bbe

Parents:

a8d80c2

git-author:

Alex Dehnert <adehnert@…> (08/05/11 03:42:44)

git-committer:

Alex Dehnert <adehnert@…> (08/05/11 03:42:44)

Message:

Validate new officers

This fills two former voids:

• President and Treasurer now must be students
• All people must have Athena accounts

Per brief discussion on -c asa, people holding a position that they can no
longer hold (deactivated student account, non-student president and treasurer)
will (normally) produce warnings but will not be forcibly removed.

Location:

asadb/groups

Files:

• admin.py (modified) (1 diff)
• migrations/0004_add_require_student.py (added)
• models.py (modified) (3 diffs)
• views.py (modified) (3 diffs)

asadb/groups/admin.py

@@ -25 +25 @@
         'slug',
         'max_count',
+        'require_student',
     )
     list_display_links = ('id', 'display_name', 'slug', )

asadb/groups/models.py

@@ -61 +61 @@
     description = models.TextField()
     max_count = models.IntegerField(default=UNLIMITED, help_text='Maximum number of holders of this role. Use %d for no limit.' % UNLIMITED)
+    require_student = models.BooleanField(default=False)
 
     def __str__(self, ):
@@ -101 +102 @@
 
 
+class AthenaMoiraAccount_ActiveManager(models.Manager):
+    def get_query_set(self, ):
+        return super(AthenaMoiraAccount_ActiveManager, self).get_query_set().filter(del_date=None)
+
 class AthenaMoiraAccount(models.Model):
     username = models.CharField(max_length=8)
@@ -111 +116 @@
     del_date        = models.DateField(help_text="Date when this person was removed from the dump.", blank=True, null=True, )
     mod_date        = models.DateField(help_text="Date when this person's record was last changed.", blank=True, null=True, )
+
+    objects = models.Manager()
+    active_accounts = AthenaMoiraAccount_ActiveManager()
+
+    def is_student(self, ):
+        # XXX: Is this... right?
+        return self.account_class == 'G' or self.account_class.isdigit()
+
     def __str__(self, ):
         if self.mutable:

asadb/groups/views.py

@@ -163 +163 @@
 
         new_people = {}
+        moira_accounts = {}
         for i in range(max_new):
             key = "extra.%d" % (i, )
-            if key in request.POST:
-                # TODO: validate as real usernames
-                new_people[i] = request.POST[key]
+            if key in request.POST and request.POST[key] != "":
+                username = request.POST[key]
+                try:
+                    moira_accounts[username] = groups.models.AthenaMoiraAccount.active_accounts.get(username=username)
+                    new_people[i] = username
+                except groups.models.AthenaMoiraAccount.DoesNotExist:
+                    msgs.append('Athena account "%s" appears not to exist. Changes involving them have been ignored.' % (username, ))
+        for person in people:
+            try:
+                moira_accounts[person] = groups.models.AthenaMoiraAccount.active_accounts.get(username=person)
+            except groups.models.AthenaMoiraAccount.DoesNotExist:
+                msgs.append('Athena account "%s" appears not to exist. They can not be added to new roles. You should remove them from any roles they hold, if you have not already.' % (person, ))
         for role in roles:
             key = "holders.%s" % (role.slug, )
@@ -180 +190 @@
                 for person in people:
                     if person in new_holders:
-                        # TODO: validate student status of appropriate officers
                         if (person, role) in officers_map:
+                            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. You should replace this person ASAP.' % (role, person, ))
                             #changes.append(("Kept", "yellow", person, role))
                             kept += 1
                         else:
-                            holder = groups.models.OfficeHolder(person=person, role=role, group=group,)
-                            holder.save()
-                            changes.append(("Added", "green", person, role))
+                            if person not in moira_accounts:
+                                msgs.append('Could not add nonexistent Athena account "%s" as %s.' % (person, role, ))
+                            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.' % (role, person, ))
+                            else:
+                                holder = groups.models.OfficeHolder(person=person, role=role, group=group,)
+                                holder.save()
+                                changes.append(("Added", "green", person, role))
                     else:
                         if (person, role) in officers_map:
@@ -199 +215 @@
                         if i in new_people:
                             person = new_people[i]
-                            holder = groups.models.OfficeHolder(person=person, role=role, group=group,)
-                            holder.save()
-                            changes.append(("Added", "green", person, role))
+                            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, ))
+                            else:
+                                holder = groups.models.OfficeHolder(person=person, role=role, group=group,)
+                                holder.save()
+                                changes.append(("Added", "green", person, role))
 
         # reload the data