Changeset c7b6a3a

Timestamp:

Nov 13, 2012, 5:29:14 AM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

6fa456d

Parents:

bcd1b62

git-author:

Alex Dehnert <adehnert@…> (11/13/12 05:27:13)

git-committer:

Alex Dehnert <adehnert@…> (11/13/12 05:29:14)

Message:

Membership update: move deadlines into the DB

Move the "Deadlines and Enforcement" section of the membership update form from
the template into the database, so people who aren't DB maintainers can update
the deadlines for future cycles. Fixes ASA-#176.

Location:

asadb

Files:

• forms/migrations/0013_add_cycle_deadlines.py (added)
• forms/models.py (modified) (1 diff)
• forms/views.py (modified) (1 diff)
• template/membership/update.html (modified) (1 diff)

asadb/forms/models.py

@@ -141 +141 @@
     slug = models.SlugField(unique=True, )
     create_date = models.DateTimeField(default=datetime.datetime.now)
+    deadlines = models.TextField(blank=True)
 
     def __unicode__(self, ):

asadb/forms/views.py

@@ -361 +361 @@
         'form':form,
         'group':group_obj,
+        'cycle':cycle,
         'confirm_uri': confirm_uri,
         'pagename':'groups',

asadb/template/membership/update.html

@@ -18 +18 @@
 <p><a href='#components'>Details on each component</a> and the <a href='#form'>main form</a> are available below.</p>
 
+{% if cycle.deadlines %}
 <h2><a name='deadlines'></a>Deadlines and Enforcement</h2>
-
-<p>This form is due by Friday October 7th at 11:59PM. This is very important for confirming that your group is active, so groups that don't submit this form by that date will be fined $50. Groups that still haven't submitted this by Friday October 21st will be fined an additional $50 and will be suspended. Finally, groups that haven't submitted this by November 4th will be derecognized.</p>
+<p>{{cycle.deadlines}}</p>
+{% endif %}
 
 <h2><a name='components'></a>Components</h2>