Changeset 6fc0921

Timestamp:

Nov 17, 2011, 5:28:01 PM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

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

Children:

283099c

Parents:

728cafa (diff), 29a7eca (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@…> (11/17/11 17:28:01)

git-committer:

Alex Dehnert <adehnert@…> (11/17/11 17:28:01)

Message:

Merge branch 'new-db'

Files:

• asadb/groups/admin.py (modified) (1 diff)
• asadb/groups/diffs.py (added)
• asadb/groups/migrations/0012_group_startup.py (added)
• asadb/groups/migrations/0013_add_submitter_to_groupstartup.py (added)
• asadb/groups/migrations/0014_recognize_nge_perm.py (added)
• asadb/groups/migrations/0015_add_recognize_group.py (added)
• asadb/groups/migrations/0016_create_auth_groups.py (added)
• asadb/groups/models.py (modified) (1 diff)
• asadb/groups/urls.py (modified) (1 diff)
• asadb/groups/views.py (modified) (7 diffs)
• asadb/media/style/style.css (modified) (1 diff)
• asadb/mit/__init__.py (modified) (1 diff)
• asadb/settings.py (modified) (2 diffs)
• asadb/template/500.html (added)
• asadb/template/form_utils/fields_as_trs.html (modified) (1 diff)
• asadb/template/groups/account_lookup.html (added)
• asadb/template/groups/create/err.not-applying.html (added)
• asadb/template/groups/create/nge.html (added)
• asadb/template/groups/create/startup-submitted-email.txt (added)
• asadb/template/groups/create/startup.html (added)
• asadb/template/groups/create/startup_review.html (added)
• asadb/template/groups/create/startup_thanks.html (added)
• asadb/template/groups/diffs/asa-official-update.txt (added)
• asadb/template/groups/diffs/asa-update-mail.txt (added)
• asadb/template/groups/diffs/new-group-accounts.txt (added)
• asadb/template/groups/diffs/new-group-announce.txt (added)
• asadb/template/groups/diffs/sao-update-mail.txt (added)
• asadb/template/groups/group_detail.html (modified) (4 diffs)
• asadb/template/groups/groupstartup_list.html (added)
• asadb/template/index.html (modified) (1 diff)
• asadb/util/db_form_utils.py (modified) (1 diff)
• asadb/util/emailbackend.py (added)
• asadb/util/emails.py (added)
• asadb/util/mailman.py (added)
• asadb/util/migrations.py (added)
• design/stakeholders/asa-official.txt (added)
• .gitignore (modified) (1 diff)
• asadb/util/diff_static_data.sh (added)
• asadb/util/dump_group_perms.py (added)
• asadb/util/warehouse-refresh.sh (modified) (2 diffs)

asadb/groups/admin.py

@@ -27 +27 @@
 admin.site.register(groups.models.Group, GroupAdmin)
 
+
+class Admin_GroupStartup(VersionAdmin):
+    list_display = (
+        'id',
+        'group',
+        'stage',
+        'submitter',
+        'president_kerberos',
+        'create_officer_list',
+        'create_group_list',
+        'create_athena_locker',
+    )
+    list_display_links = ('id', 'group', )
+    search_fields = [ 'group__name', 'group__abbreviation', 'submitter', 'president_kerberos', ]
+admin.site.register(groups.models.GroupStartup, Admin_GroupStartup)
 
 class Admin_GroupNote(VersionAdmin):

asadb/groups/models.py

@@ -96 +96 @@
             ('admin_group', 'Administer basic group information'),
             ('view_signatories', 'View signatory information for all groups'),
-        )
+            ('recognize_nge', 'Recognize Non-Group Entity'),
+            ('recognize_group', 'Recognize groups'),
+        )
+
+
+GROUP_STARTUP_STAGE_SUBMITTED = 10
+GROUP_STARTUP_STAGE_APPROVED = 20
+GROUP_STARTUP_STAGE_REJECTED = -10
+GROUP_STARTUP_STAGE = (
+    (GROUP_STARTUP_STAGE_SUBMITTED,     'submitted'),
+    (GROUP_STARTUP_STAGE_APPROVED,      'approved'),
+    (GROUP_STARTUP_STAGE_REJECTED,      'rejected'),
+)
+
+class GroupStartup(models.Model):
+    group = models.ForeignKey(Group)
+    stage = models.IntegerField(choices=GROUP_STARTUP_STAGE)
+    submitter = models.CharField(max_length=30, editable=False, )
+    create_officer_list = models.BooleanField()
+    create_group_list = models.BooleanField()
+    create_athena_locker = models.BooleanField()
+    president_name = models.CharField(max_length=50)
+    president_kerberos = models.CharField(max_length=8)
+    treasurer_name = models.CharField(max_length=50)
+    treasurer_kerberos = models.CharField(max_length=8)
 
 

asadb/groups/urls.py

@@ -13 +13 @@
     (r'^(?P<pk>\d+)/', include(group_patterns, ), ),
     url(r'^$', groups.views.GroupListView.as_view(), name='list', ),
+    url(r'^startup/$', groups.views.startup_form, name='startup', ),
+    url(r'^startup/review/$', groups.views.GroupStartupListView.as_view(), name='startup-list', ),
+    url(r'^startup/review/(?P<pk>\d+)$', groups.views.recognize_normal_group, name='startup-recognize', ),
+    url(r'^recognize/nge/$', groups.views.recognize_nge, name='recognize-nge', ),
     url(r'^search/$', groups.views.search_groups, name='search', ),
     url(r'^recent_changes/$', groups.views.GroupHistoryView.as_view(), name='manage-history', ),
     url(r'^signatories/$', groups.views.view_signatories, name='signatories', ),
+    url(r'^account_lookup/$', groups.views.account_lookup, name='account-lookup', ),
 )
 

asadb/groups/views.py

@@ -17 +17 @@
 from django.core.urlresolvers import reverse
 from django.core.mail import EmailMessage, mail_admins
-from django.forms import Form
-from django.forms import ModelForm
-from django.forms import ModelChoiceField
+from django import forms
+from django.forms import ValidationError
 from django.db import connection
 from django.db.models import Q
@@ -28 +27 @@
 
 from util.db_form_utils import StaticWidget
-
+from util.emails import email_from_template
+
+
+
+############
+# Homepage #
+############
 
 def view_homepage(request, ):
@@ -56 +61 @@
     }
     return render_to_response('index.html', context, context_instance=RequestContext(request), )
+
+
+
+################
+# Single group #
+################
+
+class GroupDetailView(DetailView):
+    context_object_name = "group"
+    model = groups.models.Group
+    def get_context_data(self, **kwargs):
+        # Call the base implementation first to get a context
+        context = super(GroupDetailView, self).get_context_data(**kwargs)
+        group = context['group']
+
+        # Indicate whether this person should be able to see "private" info
+        context['viewpriv'] = self.request.user.has_perm('groups.view_group_private_info', group)
+        context['adminpriv'] = self.request.user.has_perm('groups.admin_group', group)
+        context['notes'] = group.viewable_notes(self.request.user)
+
+        # People involved in the group
+        just_roles = groups.models.OfficerRole.objects.all()
+        if context['viewpriv'] or self.request.user.has_perm('groups.view_signatories'):
+            # Can see the non-public stuff
+            pass
+        else:
+            just_roles = just_roles.filter(publicly_visible=True)
+        roles = []
+        for role in just_roles:
+            roles.append((role.display_name, role, group.officers(role=role), ))
+        context['roles'] = roles
+
+        return context
 
 
@@ -136 +174 @@
             request_obj.save()
             form.save_m2m()
-
-            # Send email
-            #tmpl = get_template('fysm/update_email.txt')
-            #ctx = Context({
-            #    'group': group_obj,
-            #    'fysm': fysm_obj,
-            #    'view_uri': view_uri,
-            #    'submitter': request.user,
-            #    'request': request,
-            #    'sender': "ASA FYSM team",
-            #})
-            #body = tmpl.render(ctx)
-            #email = EmailMessage(
-            #    subject='FYSM entry for "%s" updated by "%s"' % (
-            #        group_obj.name,
-            #        request.user,
-            #    ),
-            #    body=body,
-            #    from_email='asa-fysm@mit.edu',
-            #    to=[group_obj.officer_email, request.user.email, ],
-            #    bcc=['asa-fysm-submissions@mit.edu', ]
-            #)
-            #email.send()
             msg = "Thanks for editing!"
         else:
@@ -173 +188 @@
     return render_to_response('groups/group_change_main.html', context, context_instance=RequestContext(request), )
 
+
+##################
+# GROUP CREATION #
+##################
+
+def validate_athena(username, student=False, ):
+    try:
+        person = groups.models.AthenaMoiraAccount.active_accounts.get(username=username)
+        if student and not person.is_student():
+            raise ValidationError('This must be a current student.')
+    except groups.models.AthenaMoiraAccount.DoesNotExist:
+        raise ValidationError('This must be a valid Athena username.')
+
+
+class GroupCreateForm(form_utils.forms.BetterModelForm):
+    create_officer_list = forms.BooleanField(required=False)
+    create_group_list = forms.BooleanField(required=False)
+    create_athena_locker = forms.BooleanField(required=False)
+
+    president_name = forms.CharField(max_length=50, )
+    president_kerberos = forms.CharField(min_length=3, max_length=8, )
+    treasurer_name = forms.CharField(max_length=50)
+    treasurer_kerberos = forms.CharField(min_length=3, max_length=8, )
+    def clean_president(self, ):
+        username = self.cleaned_data['president_kerberos']
+        validate_athena(username, True, )
+        return username
+
+    def clean_treasurer(self, ):
+        username = self.cleaned_data['treasurer_kerberos']
+        validate_athena(username, True, )
+        return username
+
+    class Meta:
+        fieldsets = [
+            ('basic', {
+                'legend': 'Basic Information',
+                'fields': ['name', 'abbreviation', 'description', ],
+            }),
+            ('officers', {
+                'legend': 'Officers',
+                'fields': ['president_name', 'president_kerberos', 'treasurer_name', 'treasurer_kerberos', ],
+            }),
+            ('type', {
+                'legend': 'Type',
+                'fields': ['activity_category', 'group_class', 'group_funding', ],
+            }),
+            ('technical', {
+                'legend': 'Technical Information',
+                'fields': [
+                    'officer_email', 'create_officer_list',
+                    'group_email', 'create_group_list',
+                    'athena_locker', 'create_athena_locker',
+                ],
+            }),
+            ('financial', {
+                'legend': 'Financial Information',
+                'fields': ['main_account_id', 'funding_account_id', ],
+            }),
+            ('constitution', {
+                'legend': 'Constitution',
+                'fields': ['constitution_url', ],
+            }),
+        ]
+        model = groups.models.Group
+
+
+class GroupCreateNgeForm(GroupCreateForm):
+    def __init__(self, *args, **kwargs):
+        super(GroupCreateNgeForm, self).__init__(*args, **kwargs)
+        self.fields['treasurer_name'].required = False
+        self.fields['treasurer_kerberos'].required = False
+
+
+class GroupCreateStartupForm(GroupCreateForm):
+    def __init__(self, *args, **kwargs):
+        super(GroupCreateStartupForm, self).__init__(*args, **kwargs)
+        self.fields['activity_category'].required = True
+        self.fields['constitution_url'].required = True
+        self.fields['constitution_url'].help_text = "Please put a copy of your finalized constitution on a publicly-accessible website (e.g. your group's, or your own, Public folder), and link to it in the box above."
+
+    class Meta(GroupCreateForm.Meta):
+        fieldsets = filter(
+            lambda fieldset: fieldset[0] not in ['financial', ],
+            GroupCreateForm.Meta.fieldsets
+        )
+
+def create_group_get_emails(group, group_startup, officer_emails, ):
+    # Figure out all the accounts mail parameters
+    accounts_count = 0
+    create_officer_list = False
+    if group_startup.create_officer_list and group.officer_email:
+        create_officer_list = True
+        accounts_count += 1
+    create_group_list = False
+    if group_startup.create_group_list and group.group_email:
+        create_group_list = True
+        accounts_count += 1
+    create_athena_locker = False
+    if group_startup.create_athena_locker and group.athena_locker:
+        create_athena_locker = True
+        accounts_count += 1
+    officer_list, _, officer_domain = group.officer_email.partition('@')
+    group_list, _, group_domain = group.group_email.partition('@')
+
+    # Fill out the Context
+    mail_context = Context({
+        'group': group,
+        'group_startup': group_startup,
+        'create_officer_list': create_officer_list,
+        'create_group_list': create_group_list,
+        'create_athena_locker': create_athena_locker,
+        'officer_list': officer_list,
+        'group_list': group_list,
+        'officer_emails': officer_emails,
+    })
+
+    # Welcome mail
+    welcome_mail = email_from_template(
+        tmpl='groups/diffs/new-group-announce.txt',
+        context=mail_context,
+        subject='ASA Group Recognition: %s' % (group.name, ),
+        to=officer_emails,
+        cc=['asa-new-group-announce@mit.edu'],
+        from_email='asa-exec@mit.edu',
+    )
+
+    # Accounts mail
+    if accounts_count > 0:
+        accounts_mail = email_from_template(
+            tmpl='groups/diffs/new-group-accounts.txt',
+            context=mail_context,
+            subject='New Student Activity: %s' % (group.name, ),
+            to=['accounts@mit.edu'],
+            cc=officer_emails+['asa-admin@mit.edu'],
+            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:
+        accounts_mail = None
+    return welcome_mail, accounts_mail
+
+def create_group_officers(group, formdata, save=True, ):
+    officer_emails = [ ]
+    for officer in ('president', 'treasurer', ):
+        username = formdata[officer+'_kerberos']
+        if username:
+            if save: groups.models.OfficeHolder(
+                person=username,
+                role=groups.models.OfficerRole.objects.get(slug=officer),
+                group=group,
+            ).save()
+            officer_emails.append('%s@mit.edu' % (formdata[officer+'_kerberos'], ))
+    return officer_emails
+
+@permission_required('groups.recognize_nge')
+def recognize_nge(request, ):
+    msg = None
+
+    initial = {
+        'create_officer_list': False,
+        'create_group_list': False,
+        'create_athena_locker': True,
+    }
+    group = groups.models.Group()
+    group.group_status = groups.models.GroupStatus.objects.get(slug='nge', )
+    group.recognition_date  = datetime.datetime.now()
+    if request.method == 'POST': # If the form has been submitted...
+        # A form bound to the POST data
+        form = GroupCreateNgeForm(
+            request.POST, request.FILES,
+            initial=initial,
+            instance=group,
+        )
+
+        if form.is_valid(): # All validation rules pass
+            group.set_updater(request.user)
+            form.save()
+            officer_emails = create_group_officers(group, form.cleaned_data, )
+
+            return redirect(reverse('groups:group-detail', args=[group.pk]))
+        else:
+            msg = "Validation failed. See below for details."
+
+    else:
+        form = GroupCreateNgeForm(initial=initial, instance=group, ) # An unbound form
+
+    context = {
+        'form':  form,
+        'msg':   msg,
+        'pagename':   'groups',
+    }
+    return render_to_response('groups/create/nge.html', context, context_instance=RequestContext(request), )
+
+def startup_form(request, ):
+    msg = None
+
+    initial = {
+        'create_officer_list': True,
+        'create_group_list': True,
+        'create_athena_locker': True,
+    }
+    group = groups.models.Group()
+    group.group_status = groups.models.GroupStatus.objects.get(slug='applying', )
+    group.recognition_date  = datetime.datetime.now()
+    if request.method == 'POST': # If the form has been submitted...
+        # A form bound to the POST data
+        form = GroupCreateStartupForm(
+            request.POST, request.FILES,
+            initial=initial,
+            instance=group,
+        )
+
+        if form.is_valid(): # All validation rules pass
+            group.set_updater(request.user)
+            form.save()
+
+            group_startup = groups.models.GroupStartup()
+            group_startup.group = group
+            group_startup.stage = groups.models.GROUP_STARTUP_STAGE_SUBMITTED
+            group_startup.submitter = request.user.username
+
+            group_startup.create_officer_list = form.cleaned_data['create_officer_list']
+            group_startup.create_group_list = form.cleaned_data['create_group_list']
+            group_startup.create_athena_locker = form.cleaned_data['create_athena_locker']
+
+            group_startup.president_name = form.cleaned_data['president_name']
+            group_startup.president_kerberos = form.cleaned_data['president_kerberos']
+            group_startup.treasurer_name = form.cleaned_data['treasurer_name']
+            group_startup.treasurer_kerberos = form.cleaned_data['treasurer_kerberos']
+
+            group_startup.save()
+
+            context = {
+                'group':            group,
+                'group_startup':    group_startup,
+                'pagename':         'groups',
+            }
+
+            email_from_template(
+                tmpl='groups/create/startup-submitted-email.txt',
+                context=context,
+                subject='ASA Startup Application: %s' % (group.name, ),
+                to=[request.user.email] + create_group_officers(group, form.cleaned_data, save=False, ),
+                cc=['asa-groups@mit.edu'],
+                from_email='asa-groups@mit.edu',
+            ).send()
+
+            return render_to_response('groups/create/startup_thanks.html', context, context_instance=RequestContext(request), )
+        else:
+            msg = "Validation failed. See below for details."
+
+    else:
+        form = GroupCreateStartupForm(initial=initial, instance=group, ) # An unbound form
+
+    context = {
+        'form':  form,
+        'msg':   msg,
+        'pagename':   'groups',
+    }
+    return render_to_response('groups/create/startup.html', context, context_instance=RequestContext(request), )
+
+class GroupRecognitionForm(forms.Form):
+    test = forms.BooleanField()
+
+@permission_required('groups.recognize_group')
+def recognize_normal_group(request, pk, ):
+    group_startup = get_object_or_404(groups.models.GroupStartup, pk=pk, )
+    group = group_startup.group
+
+    context = {
+        'startup': group_startup,
+        'group': group,
+        'pagename' : 'groups',
+    }
+
+    if group.group_status.slug != 'applying':
+        return render_to_response('groups/create/err.not-applying.html', context, context_instance=RequestContext(request), )
+    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['msg'] = ""
+    if request.method == 'POST':
+        if 'approve' in request.POST:
+            group_startup.stage = groups.models.GROUP_STARTUP_STAGE_APPROVED
+            group_startup.save()
+
+            group.group_status = groups.models.GroupStatus.objects.get(slug='active')
+            group.constitution_url = ""
+            group.recognition_date = datetime.date.today()
+            group.set_updater(request.user)
+
+            group.save()
+            officer_emails = create_group_officers(group, group_startup.__dict__, )
+            welcome_mail, accounts_mail = create_group_get_emails(group, group_startup, officer_emails, )
+            welcome_mail.send()
+            if accounts_mail:
+                accounts_mail.send()
+            context['msg'] = 'Group approved.'
+            context['msg_type'] = 'info'
+        elif 'reject' in request.POST:
+            group_startup.stage = groups.models.GROUP_STARTUP_STAGE_REJECTED
+            group_startup.save()
+            group.group_status = groups.models.GroupStatus.objects.get(slug='derecognized')
+            group.save()
+            note = groups.models.GroupNote(
+                author=request.user.username,
+                body="Group rejected during recognition process.",
+                acl_read_group=True,
+                acl_read_offices=True,
+                group=group,
+            ).save()
+            context['msg'] = 'Group rejected.'
+            context['msg_type'] = 'info'
+        else:
+            context['disp_form'] = True
+    else:
+        context['disp_form'] = True
+
+    return render_to_response('groups/create/startup_review.html', context, context_instance=RequestContext(request), )
+
+class GroupStartupListView(ListView):
+    model = groups.models.GroupStartup
+    template_object_name = 'startup'
+
+    def get_queryset(self, ):
+        qs = super(GroupStartupListView, self).get_queryset()
+        qs = qs.filter(stage=groups.models.GROUP_STARTUP_STAGE_SUBMITTED)
+        qs = qs.select_related('group')
+        return qs
+
+    def get_context_data(self, **kwargs):
+        context = super(GroupStartupListView, self).get_context_data(**kwargs)
+        context['pagename'] = 'groups'
+        return context
+
+
+##################
+# Multiple group #
+##################
 
 class GroupFilter(django_filters.FilterSet):
@@ -208 +569 @@
         context['pagename'] = 'groups'
         context['filter'] = self.filterset
-        return context
-
-
-class GroupDetailView(DetailView):
-    context_object_name = "group"
-    model = groups.models.Group
-    def get_context_data(self, **kwargs):
-        # Call the base implementation first to get a context
-        context = super(GroupDetailView, self).get_context_data(**kwargs)
-        group = context['group']
-
-        # Indicate whether this person should be able to see "private" info
-        context['viewpriv'] = self.request.user.has_perm('groups.view_group_private_info', group)
-        context['adminpriv'] = self.request.user.has_perm('groups.admin_group', group)
-        context['notes'] = group.viewable_notes(self.request.user)
-
-        # People involved in the group
-        just_roles = groups.models.OfficerRole.objects.all()
-        if context['viewpriv'] or self.request.user.has_perm('groups.view_signatories'):
-            # Can see the non-public stuff
-            pass
-        else:
-            just_roles = just_roles.filter(publicly_visible=True)
-        roles = []
-        for role in just_roles:
-            roles.append((role.display_name, role, group.officers(role=role), ))
-        context['roles'] = roles
-
-        return context
-
-
-class GroupHistoryView(ListView):
-    context_object_name = "version_list"
-    template_name = "groups/group_version.html"
-
-    def get_queryset(self):
-        history_entries = None
-        if 'pk' in self.kwargs:
-            group = get_object_or_404(groups.models.Group, pk=self.kwargs['pk'])
-            history_entries = reversion.models.Version.objects.get_for_object(group)
-        else:
-            history_entries = reversion.models.Version.objects.all()
-            group_content_type = ContentType.objects.get_for_model(groups.models.Group)
-            history_entries = history_entries.filter(content_type=group_content_type)
-        length = len(history_entries)
-        if length > 150:
-            history_entries = history_entries[length-100:]
-        return history_entries
-
-    def get_context_data(self, **kwargs):
-        context = super(GroupHistoryView, self).get_context_data(**kwargs)
-        if 'pk' in self.kwargs:
-            group = get_object_or_404(groups.models.Group, pk=self.kwargs['pk'])
-            context['title'] = "History for %s" % (group.name, )
-        else:
-            context['title'] = "Recent Changes"
         return context
 
@@ -439 +744 @@
         }
         return render_to_response('groups/group_search.html', context, context_instance=RequestContext(request), )
+
+
+class GroupHistoryView(ListView):
+    context_object_name = "version_list"
+    template_name = "groups/group_version.html"
+
+    def get_queryset(self):
+        history_entries = None
+        if 'pk' in self.kwargs:
+            group = get_object_or_404(groups.models.Group, pk=self.kwargs['pk'])
+            history_entries = reversion.models.Version.objects.get_for_object(group)
+        else:
+            history_entries = reversion.models.Version.objects.all()
+            group_content_type = ContentType.objects.get_for_model(groups.models.Group)
+            history_entries = history_entries.filter(content_type=group_content_type)
+        length = len(history_entries)
+        if length > 150:
+            history_entries = history_entries[length-100:]
+        return history_entries
+
+    def get_context_data(self, **kwargs):
+        context = super(GroupHistoryView, self).get_context_data(**kwargs)
+        if 'pk' in self.kwargs:
+            group = get_object_or_404(groups.models.Group, pk=self.kwargs['pk'])
+            context['title'] = "History for %s" % (group.name, )
+        else:
+            context['title'] = "Recent Changes"
+        return context
+
+
+class AccountLookupForm(forms.Form):
+    account_number = forms.IntegerField()
+    username = forms.CharField(help_text="Athena username of person to check")
+
+def account_lookup(request, ):
+    msg = None
+    msg_type = ""
+    account_number = None
+    username = None
+    group = None
+    office_holders = []
+
+    visible_roles  = groups.models.OfficerRole.objects.filter(publicly_visible=True)
+
+    initial = {}
+
+    if 'search' in request.GET: # If the form has been submitted...
+        # A form bound to the POST data
+        form = AccountLookupForm(request.GET)
+
+        if form.is_valid(): # All validation rules pass
+            account_number = form.cleaned_data['account_number']
+            username = form.cleaned_data['username']
+            account_q = Q(main_account_id=account_number) | Q(funding_account_id=account_number)
+            try:
+                group = groups.models.Group.objects.get(account_q)
+                office_holders = group.officers(person=username)
+                office_holders = office_holders.filter(role__in=visible_roles)
+            except groups.models.Group.DoesNotExist:
+                msg = "Group not found"
+                msg_type = "error"
+
+    else:
+        form = AccountLookupForm()
+
+    context = {
+        'username':     username,
+        'account_number': account_number,
+        'group':        group,
+        'office_holders': office_holders,
+        'form':         form,
+        'msg':          msg,
+        'msg_type':     msg_type,
+        'visible_roles':    visible_roles,
+    }
+    return render_to_response('groups/account_lookup.html', context, context_instance=RequestContext(request), )

asadb/media/style/style.css

@@ -236 +236 @@
     text-align: center;
 }
+
+/*********
+ * FORMS *
+ *********/
+
+form table tr.optional th
+{
+    font-weight: normal;
+    font-style: italic;
+}

asadb/mit/__init__.py

@@ -33 +33 @@
         username = user.username
         user.password = "ScriptsSSLAuth"
-        con = ldap.open('ldap.mit.edu')
+        con = ldap.open('ldap-too.mit.edu')
         con.simple_bind_s("", "")
         dn = "dc=mit,dc=edu"

asadb/settings.py

@@ -8 +8 @@
 DEBUG = False
 TEMPLATE_DEBUG = DEBUG
+
+# Is this the main, production deployment?
+# If not, we won't try to propagate things to other systems.
+# (For example, no changing asa-official membership.)
+PRODUCTION_DEPLOYMENT = False
 
 ADMINS = (
@@ -63 +68 @@
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.load_template_source',
+    'django.template.loaders.filesystem.Loader',
     'django.template.loaders.app_directories.load_template_source',
 #     'django.template.loaders.eggs.load_template_source',

asadb/template/form_utils/fields_as_trs.html

@@ -10 +10 @@
     {{ field.errors }}
     {{ field }}
+    {% if field.help_text %}<p>{{ field.help_text }}</p>{% endif %}
   </td>
 </tr>

asadb/template/groups/group_detail.html

@@ -7 +7 @@
 {% if adminpriv %}<a href='{%url groups:group-manage-main group.pk %}'>[update]</a></p>{%endif%}
 </h1>
+
+<div class='messagebox errorbox'>
+<p>Note: Fields marked [redacted temporarily] are being redacted for part of the beta, but are likely to be public later on. Please contact asa-db@mit.edu if you object to them becoming public.</p>
+</div>
 
 <table class='pretty-table'>
@@ -21 +25 @@
 <tr><th>Website</th><td><a href="{{group.website_url}}">{{group.website_url}}</a></td></tr>
 <tr><th>Meeting times</th><td>{{group.meeting_times}}</td></tr>
-<tr><th>Officer email</th><td>{{group.officer_email}}</td></tr>
+<tr><th>Officer email</th><td>redacted-temporarily@mit.edu</td></tr>
 {% if viewpriv %}<tr class='private-info'>
     <th>Group email</th>
@@ -32 +36 @@
     <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>[redacted temporarily]</li>{%endfor%}
     </ul></td>
 </tr>
@@ -44 +48 @@
 <tr><th colspan='2'>Financial Information</th></tr>
 <tr><th>Funding status</th><td>{{group.group_funding}}</td></tr>
-<tr><th>Main Account</th><td>{{group.main_account_id}}</td></tr>
-<tr><th>Funding Account</th><td>{{group.funding_account_id}}</td></tr>
+<tr><th>Main Account</th><td>272[redacted temporarily]</td></tr>
+<tr><th>Funding Account</th><td>272[redacted temporarily]</td></tr>
 
 <tr><th colspan='2'>Additional Information</th></tr>

asadb/template/index.html

@@ -14 +14 @@
     </ul></li>
     {%if perms.groups.view_signatories %}<li><a href='{% url groups:signatories %}'>View Signatories</a></li>{%endif%}
+    <li>Group recognition<ul>
+        <li><a href='http://web.mit.edu/asa/start/new-group-app.html'>New Group Application</a></li>
+        {%if perms.groups.add_group %}<li><a href='{% url groups:startup %}'>Startup form</a></li>{%endif%}
+        {%if perms.groups.add_group %}<li><a href='{% url groups:startup-list %}'>Review startup applications</a></li>{%endif%}
+        {%if perms.groups.recognize_nge %}<li><a href='{% url groups:recognize-nge %}'>Recognize Non-Group Entity</a></li>{%endif%}
+    </ul></li>
 </ul>
 

asadb/util/db_form_utils.py

@@ -26 +26 @@
 
     def value_from_datadict(self, data, files, name, ):
+        for choice_value, choice_label in self.choices:
+            if choice_label == unicode(self.value):
+                return choice_value
         return self.value
 

.gitignore

@@ -8 +8 @@
 asadb/media/page-previews/fysm/
 asadb/util/saved-data/
+asadb/util/static-data/
 asadb/util/warehouse-dump.csv

asadb/util/warehouse-refresh.sh

@@ -15 +15 @@
 echo
 echo Changes in this commit:
-git show
+git show --stat
 
 echo
@@ -30 +30 @@
 echo
 echo Changes in this commit:
-git show
+git show --stat
 
 echo