Changeset ac93a0c

Timestamp:

Nov 14, 2011, 3:18:33 PM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

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

Children:

ab453af

Parents:

99587d8

git-author:

Alex Dehnert <adehnert@…> (11/14/11 15:18:33)

git-committer:

Alex Dehnert <adehnert@…> (11/14/11 15:18:33)

Message:

Save submitter of a group startup form

Location:

asadb

Files:

• groups/admin.py (modified) (2 diffs)
• groups/migrations/0013_add_submitter_to_groupstartup.py (added)
• groups/models.py (modified) (1 diff)
• groups/views.py (modified) (1 diff)
• template/groups/create/startup_review.html (modified) (1 diff)

asadb/groups/admin.py

@@ -33 +33 @@
         'group',
         'stage',
+        'submitter',
         'president_kerberos',
         'create_officer_list',
@@ -39 +40 @@
     )
     list_display_links = ('id', 'group', )
-    search_fields = [ 'group__name', 'group__abbreviation', 'president_kerberos', ]
+    search_fields = [ 'group__name', 'group__abbreviation', 'submitter', 'president_kerberos', ]
 admin.site.register(groups.models.GroupStartup, Admin_GroupStartup)
 

asadb/groups/models.py

@@ -111 +111 @@
     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()

asadb/groups/views.py

@@ -420 +420 @@
             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']

asadb/template/groups/create/startup_review.html

@@ -33 +33 @@
     <td><a href='{{group.constitution_url}}'>{{group.constitution_url}}</a></td>
 </tr>
-<tr><th>Application date</th><td>{{group.recognition_date}}</td></tr>
+<tr><th>Application date</th><td>{{group.recognition_date}} by {{startup.submitter}}</td></tr>
 <tr><th>Last updated</th><td>{{group.update_string}}</td></tr>