Changeset ecb0997 for asadb/forms

Timestamp:

Oct 21, 2012, 8:44:09 PM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

9faa1b2

Parents:

21c6ad4

git-author:

Alex Dehnert <adehnert@…> (10/21/12 20:44:09)

git-committer:

Alex Dehnert <adehnert@…> (10/21/12 20:44:09)

Message:

Minor cleanup of person membership update view

File:

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

asadb/forms/views.py

@@ -359 +359 @@
     }
     cycle = forms.models.GroupConfirmationCycle.latest()
+
+    # Initialize/find the PersonMembershipUpdate for this user
     try:
         update_obj = forms.models.PersonMembershipUpdate.objects.get(
@@ -405 +407 @@
     message_type = "info"
 
+    # Handle the single group add/remove forms
+    # * removing previously confirmed groups
+    # * add/remove groups that list the user in a role
+    # * add/remove groups the user searched for
     if request.method == 'POST' and 'add-remove' in request.POST:
         group = groups.models.Group.objects.get(id=request.POST['group'])
@@ -425 +431 @@
             message_type = "alert"
 
-    if request.method == 'POST' and 'list' in request.POST: # If the form has been submitted...
-        form = Form_PersonMembershipUpdate(request.POST, request.FILES, instance=update_obj) # A form bound to the POST data
-
-        if form.is_valid(): # All validation rules pass
+    # Handle the big list of groups
+    if request.method == 'POST' and 'list' in request.POST:
+        form = Form_PersonMembershipUpdate(request.POST, request.FILES, instance=update_obj)
+        if form.is_valid():
             request_obj = form.save()
             message = "Update saved"
-
     else:
-        form = Form_PersonMembershipUpdate(initial=initial, instance=update_obj, ) # An unbound form
-
+        form = Form_PersonMembershipUpdate(initial=initial, instance=update_obj, )
+
+    # Render the page
     context = {
         'role_groups':role_groups,