Changeset 41ebbd1

Timestamp:

Mar 31, 2012, 7:39:14 PM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

010b19f

Parents:

9becc84

git-author:

Alex Dehnert <adehnert@…> (03/31/12 19:39:14)

git-committer:

Alex Dehnert <adehnert@…> (03/31/12 19:39:14)

Message:

Reorganize groups/views.py somewhat

File:

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

asadb/groups/views.py

@@ -36 +36 @@
 emailvalidator = EmailValidator(email_re)
 
+
+
 ############
 # Homepage #
@@ -206 +208 @@
     }
     return render_to_response('groups/group_change_main.html', context, context_instance=RequestContext(request), )
+
+
+
+##################
+# ACCOUNT LOOKUP #
+##################
+
+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), )
+
 
 
@@ -546 +602 @@
         context['pagename'] = 'groups'
         return context
+
 
 
@@ -782 +839 @@
         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, )
+            context['adminpriv'] = self.request.user.has_perm('groups.admin_group', group)
+            context['group'] = group
+        else:
+            context['title'] = "Recent Changes"
+        return context
+
+
+
+#######################
+# REPORTING COMPONENT #
+#######################
+
 class ReportingForm(form_utils.forms.BetterForm):
     basic_fields_choices = groups.models.Group.reporting_fields()
@@ -831 +924 @@
         super(GroupReportingFilter, self).__init__(data, *args, **kwargs)
 
+def format_id(pk):
+    url = reverse('groups:group-detail', kwargs={'pk':pk})
+    return mark_safe("<a href='%s'>%d</a>" % (url, pk))
+
 def format_url(url):
     try:
@@ -848 +945 @@
         escaped = html.escape(email)
         return mark_safe("<a href='mailto:%s'>%s</a>" % (escaped, escaped))
-
-
-def format_id(pk):
-    url = reverse('groups:group-detail', kwargs={'pk':pk})
-    return mark_safe("<a href='%s'>%d</a>" % (url, pk))
 
 reporting_html_formatters = {
@@ -912 +1004 @@
             report_groups.append(group_data)
 
+        # Handle output as CSV
         if output_format == 'csv':
             if output_disposition == 'download':
@@ -926 +1019 @@
             return response
 
+    # Handle output as HTML
     context = {
         'form': form,
@@ -934 +1028 @@
     }
     return render_to_response('groups/reporting.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, )
-            context['adminpriv'] = self.request.user.has_perm('groups.admin_group', group)
-            context['group'] = group
-        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), )