Changeset aed3e6d for asadb

Timestamp:

Dec 3, 2013, 12:31:49 AM (12 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, stable, stage

Children:

eab727a

Parents:

7dde669 (diff), d9624e8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Alex Dehnert <adehnert@…> (12/03/13 00:31:49)

git-committer:

Alex Dehnert <adehnert@…> (12/03/13 00:31:49)

Message:

Merge branch 'membership-confirmations'

• membership-confirmations: Link people lookup tool from membership update page People lookup: mention the data source People lookup: Support large numbers of people People lookup: make the UI more reasonable Basic people lookup support (ASA-#186) Reword membership definition text More thoroughly purge mention of membership lists Standarize on UK-style ndashes Remove the membership list Do my counting in the DB... Save some unnecessary queries with select_related Finish removing membership confirmation search box Include suspended groups in issues.csv (ASA-#195) Memberships: refactor issues.csv slightly Make issues.csv cycle-aware (ASA-#191) JSify the giant list of groups (ASA-#185) Show the group name on the update page List only adminned groups in anti-hazing select Add Group.admin_groups method (ASA-#181)

Location:

asadb

Files:

• forms/migrations/0016_peoplestatuslookup.py (added)
• forms/models.py (modified) (3 diffs)
• forms/views.py (modified) (9 diffs)
• groups/models.py (modified) (6 diffs)
• template/base.html (modified) (1 diff)
• template/fysm/fysm_listing.html (modified) (1 diff)
• template/groups/group_change_officers.html (modified) (1 diff)
• template/membership/admin.html (modified) (1 diff)
• template/membership/confirm.html (modified) (3 diffs)
• template/membership/people-lookup.html (added)
• template/membership/thanks.html (modified) (1 diff)
• template/membership/update.html (modified) (2 diffs)
• urls.py (modified) (1 diff)
• groups/views.py (modified) (3 diffs)
• template/groups/create/startup_review.html (modified) (1 diff)

asadb/forms/models.py

@@ -1 +1 @@
 import datetime
-import os, errno
+import errno
+import json
+import os
+
+import ldap
 
 from django.conf import settings
+from django.contrib.auth.models import User
 from django.db import models
 
@@ -168 +173 @@
     num_other = models.IntegerField(verbose_name="Num non-MIT")
 
-    membership_list = models.TextField(help_text="Member emails on separate lines (Athena usernames where applicable)")
+    membership_list = models.TextField(blank=True, help_text="Member emails on separate lines (Athena usernames where applicable)")
 
     email_preface = models.TextField(blank=True, help_text="If you would like, you may add text here that will preface the text of the policies when it is sent out to the group membership list provided above.")
@@ -207 +212 @@
 
 
+class PeopleStatusLookup(models.Model):
+    people = models.TextField(help_text="Enter some usernames or email addresses to look up here.")
+    requestor = models.ForeignKey(User, null=True, blank=True, )
+    referer = models.URLField(blank=True)
+    time = models.DateTimeField(default=datetime.datetime.now)
+    classified_people_json = models.TextField()
+    _classified_people = None
+
+    def ldap_classify(self, usernames, ):
+        con = ldap.open('ldap-too.mit.edu')
+        con.simple_bind_s("", "")
+        dn = "ou=users,ou=moira,dc=mit,dc=edu"
+        fields = ['uid', 'eduPersonAffiliation', 'mitDirStudentYear']
+
+        chunk_size = 100
+        username_chunks = []
+        ends = range(chunk_size, len(usernames), chunk_size)
+        start = 0
+        for end in ends:
+            username_chunks.append(usernames[start:end])
+            start = end
+        username_chunks.append(usernames[end:])
+        print username_chunks
+
+        results = []
+        for chunk in username_chunks:
+            filters = [ldap.filter.filter_format('(uid=%s)', [u]) for u in chunk]
+            userfilter = "(|%s)" % (''.join(filters), )
+            batch_results = con.search_s(dn, ldap.SCOPE_SUBTREE, userfilter, fields)
+            results.extend(batch_results)
+
+        left = set(usernames)
+        undergrads = []
+        grads = []
+        staff = []
+        secret = []
+        other = []
+        info = {
+            'undergrads': undergrads,
+            'grads': grads,
+            'staff': staff,
+            'secret': secret,
+            'affiliate': other,
+        }
+        for result in results:
+            username = result[1]['uid'][0]
+            left.remove(username)
+            affiliation = result[1].get('eduPersonAffiliation', ['secret'])[0]
+            if affiliation == 'student':
+                year = result[1].get('mitDirStudentYear', [None])[0]
+                if year == 'G':
+                    grads.append((username, None))
+                elif year.isdigit():
+                    undergrads.append((username, year))
+                else:
+                    other.append((username, year))
+            else:
+                info[affiliation].append((username, None, ))
+        info['unknown'] = [(u, None) for u in left]
+        return info
+
+    def classify_people(self, people):
+        mit_usernames = []
+        alum_addresses = []
+        other_mit_addresses = []
+        nonmit_addresses = []
+
+        for name in people:
+            local, at, domain = name.partition('@')
+            if domain.lower() == 'mit.edu' or domain == '':
+                mit_usernames.append(local)
+            elif domain.lower() == 'alum.mit.edu':
+                alum_addresses.append((name, None))
+            elif domain.endswith('.mit.edu'):
+                other_mit_addresses.append((name, None))
+            else:
+                nonmit_addresses.append((name, None))
+
+        results = self.ldap_classify(mit_usernames)
+        results['alum'] = alum_addresses
+        results['other-mit'] = other_mit_addresses
+        results['non-mit'] = nonmit_addresses
+        return results
+
+    def update_classified_people(self):
+        people = [p for p in [p.strip() for p in self.people.split('\n')] if p]
+        self._classified_people = self.classify_people(people)
+        self.classified_people_json = json.dumps(self._classified_people)
+        return self._classified_people
+
+    @property
+    def classified_people(self):
+        if self._classified_people is None:
+            self._classified_people = json.loads(self.classified_people_json)
+        return self._classified_people
+
+    def classifications_with_descriptions(self):
+        descriptions = {
+            'undergrads':   'Undergraduate students (class year in parentheses)',
+            'grads':        'Graduate students',
+            'alum':         "Alumni Association addresses",
+            'staff':        'MIT Staff (including faculty)',
+            'affiliate':    'This includes some alumni, group members with Athena accounts sponsored through SAO, and many others.',
+            'secret':       'People with directory information suppressed. These people have Athena accounts, but they could have any MIT affiliation, including just being a student group member.',
+            'unknown':      "While this looks like an Athena account, we couldn't find it. This could be a deactivated account, or it might never have existed.",
+            'other-mit':    ".mit.edu addresses that aren't @mit.edu or @alum.mit.edu.",
+            'non-mit':      "Non-MIT addresses, including outside addresses of MIT students.",
+        }
+
+        names = (
+            ('undergrads', 'Undergrads', ),
+            ('grads', 'Grad students', ),
+            ('alum', 'Alumni', ),
+            ('staff', 'Staff', ),
+            ('affiliate', 'Affiliates', ),
+            ('secret', 'Secret', ),
+            ('unknown', 'Unknown', ),
+            ('other-mit', 'Other MIT addresses', ),
+            ('non-mit', 'Non-MIT addresses', ),
+        )
+
+        classifications = self.classified_people
+        sorted_results = []
+        for k, label in names:
+            sorted_results.append({
+                'label': label,
+                'description': descriptions[k],
+                'people': sorted(classifications[k]),
+            })
+        return sorted_results
+
 
 ##########

asadb/forms/views.py

@@ -252 +252 @@
     cycle = forms.models.GroupConfirmationCycle.latest()
 
-    users_groups = groups.models.Group.involved_groups(request.user.username)
+    users_groups = groups.models.Group.admin_groups(request.user.username)
     qs = membership_update_qs.filter(pk__in=users_groups)
 
@@ -261 +261 @@
         queryset=qs,
         title="Submit membership update for...",
-        msg="The list below contains only groups that list you as being involved. You must be an administrator of a group to submit an update.",
     )
 
@@ -268 +267 @@
         super(Form_GroupMembershipUpdate, self).__init__(*args, **kwargs)
         self.fields['no_hazing'].required = True
+        help_text = "If you have a membership list, you can get help turning it into membership breakdown using our <a href='%s'>people lookup</a> tool. You'll need to copy the numbers back over, though." % (reverse('membership-people-lookup'), )
+        self.fields['num_undergrads'].help_text = help_text
 
     class Meta:
@@ -284 +285 @@
             'num_other_affiliate',
             'num_other',
-            'membership_list',
+            #'membership_list',
         ]
 
@@ -418 +419 @@
             role_groups[office_holder.group.pk] = (office_holder.group, set())
         role_groups[office_holder.group.pk][1].add(office_holder.role.display_name)
-
-    # Find groups the user searched for
-    filterset = groups.views.GroupFilter(request.GET, membership_update_qs)
-    filtered_groups = filterset.qs.all()
-    show_filtered_groups = ('search' in request.GET)
 
     message = ""
@@ -469 +465 @@
         'role_groups':role_groups,
         'form':form,
-        'filter':filterset,
-        'show_filtered_groups':show_filtered_groups,
-        'filtered_groups':filtered_groups,
         'member_groups':selected_groups,
         'message': message,
@@ -499 +492 @@
 
 
+class View_GroupConfirmationCyclesList(ListView):
+    context_object_name = "cycle_list"
+    template_name = "membership/admin.html"
+    model = forms.models.GroupConfirmationCycle
+
+    def get_context_data(self, **kwargs):
+        context = super(View_GroupConfirmationCyclesList, self).get_context_data(**kwargs)
+        context['pagename'] = 'groups'
+        return context
+
+
 @permission_required('groups.view_group_private_info')
-def group_confirmation_issues(request, ):
+def group_confirmation_issues(request, slug, ):
     account_numbers = ("accounts" in request.GET) and request.GET['accounts'] == "1"
 
-    active_groups = groups.models.Group.active_groups
-    group_updates = forms.models.GroupMembershipUpdate.objects.all()
+    check_groups = groups.models.Group.objects.filter(group_status__slug__in=('active', 'suspended', ))
+    check_groups = check_groups.select_related('group_status')
+    group_updates = forms.models.GroupMembershipUpdate.objects.filter(cycle__slug=slug, )
+    group_updates = group_updates.select_related('group', 'group__group_status')
     people_confirmations = forms.models.PersonMembershipUpdate.objects.filter(
         deleted__isnull=True,
         valid__gt=0,
+        cycle__slug=slug,
     )
 
     buf = StringIO.StringIO()
     output = csv.writer(buf)
-    fields = ['group_id', 'group_name', 'issue', 'num_confirm', 'officer_email', ]
+    fields = ['group_id', 'group_name', 'group_status', 'issue', 'num_confirm', 'officer_email', ]
     if account_numbers: fields.append("main_account")
     output.writerow(fields)
 
-    q_present = Q(id__in=group_updates.values('group'))
-    missing_groups = active_groups.filter(~q_present)
-    #print len(list(group_updates))
-    for group in missing_groups:
-        num_confirms = len(people_confirmations.filter(groups=group))
+    def output_issue(group, issue, num_confirms):
         fields = [
             group.id,
             group.name,
-            'unsubmitted',
+            group.group_status.slug,
+            issue,
             num_confirms,
             group.officer_email,
@@ -531 +535 @@
         output.writerow(fields)
 
+    q_present = Q(id__in=group_updates.values('group'))
+    missing_groups = check_groups.filter(~q_present)
+    #print len(list(group_updates))
+    for group in missing_groups:
+        #num_confirms = len(people_confirmations.filter(groups=group))
+        output_issue(group, 'unsubmitted', '')
+
     for group_update in group_updates:
         group = group_update.group
-        num_confirms = len(people_confirmations.filter(groups=group))
+        num_confirms = people_confirmations.filter(groups=group).count()
         problems = []
 
@@ -545 +556 @@
 
         for problem in problems:
-            fields = [
-                group.id,
-                group.name,
-                problem,
-                num_confirms,
-                group.officer_email,
-            ]
-            if account_numbers: fields.append(group.main_account_id)
-            output.writerow(fields)
-
+            output_issue(group, problem, num_confirms)
 
     return HttpResponse(buf.getvalue(), mimetype='text/csv', )
 
 
+class PeopleStatusLookupForm(ModelForm):
+    class Meta:
+        model = forms.models.PeopleStatusLookup
+        fields = ('people', )
+
+def people_status_lookup(request, pk=None, ):
+    if pk is None:
+        if request.method == 'POST':
+            form = PeopleStatusLookupForm(request.POST, request.FILES, )
+            if form.is_valid(): # All validation rules pass
+                lookup = form.save(commit=False)
+                lookup.requestor = request.user
+                lookup.referer = request.META['HTTP_REFERER']
+                lookup.update_classified_people()
+                results = lookup.classifications_with_descriptions()
+                lookup.save()
+        else:
+            form = PeopleStatusLookupForm()
+            results = None
+    else:
+        if request.user.has_perm('forms.view_peoplestatusupdate'):
+            lookup = get_object_or_404(forms.models.PeopleStatusLookup, pk=int(pk))
+            results = lookup.classifications_with_descriptions()
+            form = None
+        else:
+            raise PermissionDenied("You don't have permission to view old lookup requests.")
+
+    context = {
+        'form': form,
+        'results': results,
+    }
+
+    return render_to_response('membership/people-lookup.html', context, context_instance=RequestContext(request), )
 
 ##########

asadb/groups/models.py

@@ +1 @@
+import collections
 import datetime
 import filecmp
@@ -14 +15 @@
 from django.db.models import Q
 from django.core.validators import RegexValidator
-from django.contrib.auth.models import User
+from django.contrib.auth.models import User, Permission
+from django.contrib.contenttypes.models import ContentType
 from django.template.defaultfilters import slugify
 
@@ -112 +114 @@
         current_officers = OfficeHolder.current_holders.filter(person=username)
         users_groups = Group.objects.filter(officeholder__in=current_officers).distinct()
+
+    @staticmethod
+    def admin_groups(username, codename='admin_group'):
+        holders = OfficeHolder.current_holders.filter_perm(codename=codename).filter(person=username)
+        users_groups = Group.objects.filter(officeholder__in=holders).distinct()
         return users_groups
 
@@ -395 +402 @@
 
     @classmethod
+    def getRolesGrantingPerm(cls, perm=None, model=Group, codename=None, ):
+        """Get all OfficerRole objects granting a permission
+
+        Either `perm` or `codename` must be supplied, but not both. If
+        `codename` is provided (and `perm` is None), then `perm` the
+        permission corresponding to `model` (default: `Group`) and `codename`
+        will be found and used."""
+
+        if perm is None:
+            ct = ContentType.objects.get_for_model(model)
+            print ct
+            print Permission.objects.filter(content_type=ct)
+            perm = Permission.objects.get(content_type=ct, codename=codename)
+
+        Q_user = Q(user_permissions=perm)
+        Q_group = Q(groups__permissions=perm)
+        users = User.objects.filter(Q_user|Q_group)
+        roles = cls.objects.filter(grant_user__in=users)
+        return roles
+
+    @classmethod
     def retrieve(cls, slug, ):
         return cls.objects.get(slug=slug)
+
 reversion.register(OfficerRole)
 
@@ -407 +436 @@
         )
 
+    def filter_perm(self, perm=None, model=Group, codename=None, ):
+        roles = OfficerRole.getRolesGrantingPerm(perm=perm, model=model, codename=codename)
+        return self.get_query_set().filter(role__in=roles)
+
 class OfficeHolder(models.Model):
     EXPIRE_OFFSET   = datetime.timedelta(seconds=1)
@@ -433 +466 @@
     def __repr__(self, ):
         return str(self)
+
 reversion.register(OfficeHolder)
 

asadb/template/base.html

@@ -7 +7 @@
     <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}style/style.css" />
     <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}style/page-frame.css" />
+    {% block extrahead %}
+    {% endblock %}
 
   </head>

asadb/template/fysm/fysm_listing.html

@@ -12 +12 @@
 <p>Hello incoming MIT students!</p>
 
-<p>Student activities play an important role in student life at MIT &mdash; they're a
+<p>Student activities play an important role in student life at MIT &ndash; they're a
 great place to meet people, practice old skills and learn new ones, have fun,
 and give back to the community.  Undergraduate and graduate students, along

asadb/template/groups/group_change_officers.html

@@ -56 +56 @@
 <p>Please note:</p>
 <ul>
-    <li>We don't track "group membership" &mdash; people will show up in the list below only if they have one of the roles listed</li>
-    <li>Type only the <em>Athena username</em> to add people &mdash; do not type full names or names plus username</li>
+    <li>We don't track "group membership" &ndash; people will show up in the list below only if they have one of the roles listed</li>
+    <li>Type only the <em>Athena username</em> to add people &ndash; do not type full names or names plus username</li>
     <li>To add <em>more than four</em> new people, add four at a time and <em>submit multiple times</em></li>
 </ul>

asadb/template/membership/admin.html

@@ -1 +1 @@
 {% extends "base.html" %}
 
-{% block title %}Membership confirmations — ASA Exec pages{% endblock %}
+{% block title %}Membership confirmations – ASA Exec pages{% endblock %}
 {% block content %}
 
-<h2>Membership confirmations &mdash; ASA Exec pages</h2>
+<h2>Membership confirmations &ndash; ASA Exec pages</h2>
 
-<p>Exec members can check the <a href='{% url membership-issues %}'>list of groups with issues</a> (or a version <a href='{% url membership-issues %}?accounts=1'>with account numbers</a>)</p>
+<p>Exec members can check the issues:</p>
+
+<table class='pretty-table'>
+<tr>
+    <th>Name</th>
+    <th>Create date</th>
+    <th>Issues</th>
+    <th>(with accounts)</th>
+</tr>
+{% for cycle in cycle_list %}
+<tr>
+    <th>{{cycle.name}}</th>
+    <td>{{cycle.create_date}}</td>
+    <td><a href='{% url membership-issues cycle.slug %}'>Issues</a></td>
+    <td><a href='{% url membership-issues cycle.slug %}?accounts=1'>(with accounts)</a></td>
+</tr>
+{% endfor %}
+</table>
 
 <p>The list includes the following types of issues:</p>
 <dl>
-    <dt>unsubmitted</dt><dd>active groups ("group status" is "Active") who have not submitted an update (ever &mdash; see ASA-#191)</dd>
-    <dt>confirmations</dt><dd>groups that have submitted an update (ever) but had less than five members confirm membership (again, ever &mdash; ASA-#191)</dd>
-    <dt>50%</dt><dd>groups that (ever) submitted a confirmation with more non-students (alum, other affiliates, or other) than students (grad or undergrad)</dd>
+    <dt>unsubmitted</dt><dd>active or suspended groups who have not submitted an update
+    <dt>confirmations</dt><dd>groups that have submitted an update but had less than five members confirm membership</dd>
+    <dt>50%</dt><dd>groups that submitted a confirmation with more non-students (alum, other affiliates, or other) than students (grad or undergrad)</dd>
 </dl>
 

asadb/template/membership/confirm.html

@@ -1 +1 @@
 {% extends "base.html" %}
+
+{% block extrahead %}
+<link rel="stylesheet" href="{{MEDIA_URL}}js/libs/chosen/chosen.css">
+{% endblock %}
 
 {% block title %}Membership update{% endblock %}
@@ -77 +81 @@
 </table>
 
-<h3>Option 2: Add or remove groups by searching</h3>
+<h3>Option 2: Select all your groups at once</h3>
 
-<form action="" method="get">
-    <table class='pretty-table'>
-    {{ filter.form.as_table }}
-    </table>
-    <input type="submit" name='search' value="Search" />
-    <input type="submit" name='stop-search' value="Stop searching" />
-</form>
-
-{% if show_filtered_groups %}
-<table class='pretty-table'>
-<thead>
-    <tr>
-        <th>Name</th>
-        <th>Website</th>
-        <th>ASA DB</th>
-        <th>Description</th>
-        <th>Add/Remove</th>
-    </tr>
-</thead>
-<tbody>
-{% for group in filtered_groups %}
-    <tr>
-        <th>{{group.name}}</th>
-        <td>{% if group.website_url %}<a href='{{group.website_url}}'>Website</a>{%endif%}</td>
-        <td><a href='{% url groups:group-detail group.pk %}'>DB Entry</a></td>
-        <td>{{group.description}}</td>
-        <td>
-            <form action="" method="post">
-            {% csrf_token %}
-            <input type="hidden" name="group" value="{{group.pk}}">
-            {% if group in member_groups %}
-            <input type="hidden" name="action" value="remove">
-            <input type="submit" name="add-remove" value="Remove">
-            {% else %}
-            <input type="hidden" name="action" value="add">
-            <input type="submit" name="add-remove" value="Add">
-            {% endif %}
-            </form>
-        </td>
-    </tr>
-{% endfor %}
-</tbody>
-</table>
-{% else %}
-<p>Hit "search" to see matching groups.</p>
-{% endif %}
-
-
-<h3>Option 3: Select all your groups at once</h3>
-
-<p>Below is a list of all recognized groups. You can go through picking out the groups you are a member of. However, you should be careful not to deselect any groups (unless you aren't a member of them, of course).</p>
+<p>Below, you can add or remove any recognized group from the list of groups you are a member of.</p>
 
 <form enctype="multipart/form-data" method="post" action="">
@@ -139 +93 @@
 </form>
 
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js" type="text/javascript"></script>
+<script src="{{MEDIA_URL}}js/libs/chosen/chosen.jquery.js" type="text/javascript"></script>
+<script type="text/javascript">
+    $("#id_groups").chosen();
+</script>
+
 {% endblock %}

asadb/template/membership/thanks.html

@@ -1 +1 @@
 {% extends "base.html" %}
 
-{% block title %}Membership update — thanks{% endblock %}
+{% block title %}Membership update – thanks{% endblock %}
 {% block content %}
 
-<h2>Membership update &mdash; thanks</h2>
+<h2>Membership update &ndash; thanks</h2>
 
 <p>Thanks for confirming your group's activity. You should receive a confirmation email to your officer's list, and a copy of the anti-hazing law to your group list.</p>

asadb/template/membership/update.html

@@ -5 +5 @@
 
 
-<h1>ASA Group Registration &amp; Anti-Hazing Form</h1>
+<h1>ASA Group Registration &amp; Anti-Hazing Form for <a href='{%url groups:group-detail group.pk%}'>{{group.name}}</a></h1>
 
 <p>The purpose of this electronic registration is for the ASA to determine which groups are still active and which are not. There are four components to this process:</p>
@@ -35 +35 @@
 <h3><a name='components-membership'></a>3. Providing Membership Information</h3>
 
-<p>We are requiring that groups provide membership information &mdash; both membership numbers and a membership list. This information is important for our understanding of your group and ensuring that groups are meeting our membership standards. We will also share the membership numbers with the funding boards (GSC, UA, and LEF/ARCADE) for groups that apply to those sources. <strong>It is very important you are honest when answering these questions</strong>, even if you are concerned your membership does not meet our standards. We will provide time and support for groups to improve their student participation as needed &mdash; both in terms of number and proportion of students. Groups that are shown to be dishonest in this process, particularly with regards to meeting our standards, <strong>may have funding and space eligibility revoked or be suspended or derecognized</strong>.</p>
+<p>We are requiring that groups provide membership information &ndash; both membership definition and the corresponding numbers. This information is important for our understanding of your group and ensuring that groups are meeting our membership standards. We will also share the membership numbers with the funding boards (GSC, UA, and LEF/ARCADE) for groups that apply to those sources. <strong>It is very important you are honest when answering these questions</strong>, even if you are concerned your membership does not meet our standards. We will provide time and support for groups to improve their student participation as needed &ndash; both in terms of number and proportion of students. Groups that are shown to be dishonest in this process, particularly with regards to meeting our standards, <strong>may have funding and space eligibility revoked or be suspended or derecognized</strong>.</p>
 
 <dl>
-<dt>Minimum definition of member</dt><dd><p>For the purposes of this form, the minimum definition of membership you should use is people you would expect to confirm membership in your group (not that they all have to) and people that you consider to be regular or active members of your group. (You may be more stringent, based on how your group views or defines membership internally.) You must state the specific definition of membership you are using below. This does not need to be a membership definition that is in your constitution.</p></dd>
+<dt>Minimum definition of member</dt><dd><p>For the purposes of this form, the minimum definition of membership you use should include only people who (a) you would expect to confirm membership in your group (not that they all have to) if asked and (b) you consider to be regular or active members of your group. Members should satisfy both (a) and (b); you should not count members who satisfy only one or the other. (You may be more stringent, based on how your group views or defines membership internally.) You must state the specific definition of membership you are using below. This does not need to be a membership definition that is in your constitution.</p></dd>
 
-<dt>Privacy</dt><dd><p>The list of members you provide will not be shared. If we need to contact them we will contact your officer/exec list first &mdash; this would only be if we have concerns about the information provided or to spot-check the information provided. If feasible, we will ask your officer/exec list to contact your members directly.</p></dd>
-
-<dt>Recruitment</dt><dd><p>If you are still in the midst of or leading up to your major recruitment period, we encourage you to submit current numbers and a list soon to ensure you have something submitted before the deadline. Then you can submit an updated form later, either before or after the deadline. You don't need to do this if your membership changes slightly, but we recommend you do so if your numbers change significantly.</p></dd>
+<dt>Recruitment</dt><dd><p>If you are still in the midst of or leading up to your major recruitment period, we encourage you to submit current numbers soon to ensure you have something submitted before the deadline. Then you can submit an updated form later, either before or after the deadline. You don't need to do this if your membership changes slightly, but we recommend you do so if your numbers change significantly.</p></dd>
 
 </dl>

asadb/urls.py

@@ -65 +65 @@
     ),
     url(r'^membership/submitted/$', forms.views.View_GroupMembershipList.as_view(), name='membership-submitted', ),
-    url(
-        r'^membership/admin/$',
-        'django.views.generic.simple.direct_to_template',
-        {'template': 'membership/admin.html', 'extra_context': { 'pagename':'groups' }, },
-        name='membership-admin',
-    ),
-    url(r'^membership/admin/issues.csv$', forms.views.group_confirmation_issues, name='membership-issues', ),
+    url(r'^membership/admin/$', forms.views.View_GroupConfirmationCyclesList.as_view(), name='membership-admin', ),
+    url(r'^membership/admin/issues/(?P<slug>[\w-]+).csv$', forms.views.group_confirmation_issues, name='membership-issues', ),
+    url(r'^membership/people-lookup/((?P<pk>\d+)/)?$', forms.views.people_status_lookup, name='membership-people-lookup', ),
 
     # Midway

asadb/groups/views.py

@@ -696 +696 @@
             from_email='asa-admin@mit.edu',
         )
-        # XXX: Handle this better
-        if officer_domain != 'mit.edu' or (create_group_list and group_domain != 'mit.edu'):
-            accounts_mail.to = ['asa-groups@mit.edu']
-            accounts_mail.cc = ['asa-db@mit.edu']
-            accounts_mail.subject = "ERROR: " + accounts_mail.subject
-            accounts_mail.body = "Bad domain on officer or group list\n\n" + accounts_mail.body
 
     else:
@@ -828 +822 @@
     return render_to_response('groups/create/startup.html', context, context_instance=RequestContext(request), )
 
+def review_group_check_warnings(group_startup, group, ):
+    warnings = []
+
+    if group.name.startswith("MIT "):
+        warnings.append('Group name starts with "MIT". Generally, we prefer "Foo, MIT" instead.')
+    if "mit" in group.athena_locker.lower():
+        warnings.append('Athena locker name contains "mit", which may be redundant with paths like "http://web.mit.edu/mitfoo" or "/mit/foo/".')
+
+    if group_startup.president_kerberos == group_startup.treasurer_kerberos:
+        warnings.append('President matches Treasurer.')
+    if "%s@mit.edu" % (group_startup.president_kerberos, ) in (group.officer_email, group.group_email):
+        warnings.append('President email matches officer and/or group email.')
+    if group.officer_email == group.group_email:
+        warnings.append('Officer email matches group email.')
+
+    if '@mit.edu' not in group.officer_email or '@mit.edu' not in group.group_email:
+        warnings.append('Officer and/or group email are non-MIT. Ensure that they are not requesting the addresses be created, and consider suggesting they use an MIT list instead.')
+
+    if '.' in group.athena_locker:
+        warnings.append('Athena locker contains a ".". This is not compatible with scripts.mit.edu\'s wildcard certificate, and may cause other problems.')
+    if '_' in group.athena_locker:
+        warnings.append('Athena locker contains a "_". If this locker name gets used in a URL (for example, locker.scripts.mit.edu), it will technically violate the hostname specification and may not work in some clients.')
+    if len(group.athena_locker) > 12:
+        warnings.append('Athena locker is more than twelve characters long. In general, twelve characters is the longest Athena locker an ASA-recognized group can get.')
+
+    return warnings
+
 @permission_required('groups.recognize_group')
 def recognize_normal_group(request, pk, ):
@@ -843 +864 @@
     if group_startup.stage != groups.models.GROUP_STARTUP_STAGE_SUBMITTED:
         return render_to_response('groups/create/err.not-applying.html', context, context_instance=RequestContext(request), )
+
+    context['warnings'] = review_group_check_warnings(group_startup, group)
 
     context['msg'] = ""

asadb/template/groups/create/startup_review.html

@@ -51 +51 @@
 {% endif %}
 
+{% if warnings %}
+<div class='messagebox warnbox'>
+<h3>Potential issues</h3>
+
+<p>The following potential issues were identified with this group's startup application:</p>
+
+<ul>
+{% for warning in warnings %}
+    <li>{{warning}}</li>
+{%endfor%}
+</ul>
+
+<p>Please look over these issues. Usually, you should <strong>reach out to the group</strong> and ask them to fix (or consider fixing) each issue before you approve the group. In some cases, it may be appropriate to ignore an issue. (For example, "MIT" is a central part of some group's acronyms (like "HTGAMIT"). In these cases, confirming with the group may not be necessary.)</p>
+</div>
+{%endif%}
+
 {% if disp_form %}
 <form enctype="multipart/form-data" method="post" action="">
 {% csrf_token %}
+{% if warnings %}
+<input type='submit' name='approve' value='Approve DESPITE WARNINGS' />
+{% else %}
 <input type='submit' name='approve' value='Approve' />
+{% endif %}
 <input type='submit' name='reject' value='Reject' />
 </form>