Changeset 83759bf

Timestamp:

Apr 15, 2013, 4:21:26 AM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

52fb1d5

Parents:

a01934a

git-author:

Alex Dehnert <adehnert@…> (04/15/13 04:21:26)

git-committer:

Alex Dehnert <adehnert@…> (04/15/13 04:21:26)

Message:

Prevent 500'ing while uploading midway assignments

Add some documentation and improved error messages when uploading midway
assignments. (Fixes ASA-#224.)

Location:

asadb

Files:

• forms/views.py (modified) (1 diff)
• template/midway/upload.html (modified) (1 diff)

asadb/forms/views.py

@@ -630 +630 @@
 
 class MidwayAssignmentsUploadForm(Form):
-    assignments = FileField()
+    def validate_csv_fields(upload_file):
+        reader = csv.reader(upload_file)
+        row = reader.next()
+        for col in ('Group', 'officers', 'Table', ):
+            if col not in row:
+                raise ValidationError('Please upload a CSV file with (at least) columns "Group", "officers", and "Table". (Missing at least "%s".)' % (col, ))
+
+    assignments = FileField(validators=[validate_csv_fields])
 
 @permission_required('forms.add_midwayassignment')

asadb/template/midway/upload.html

@@ -46 +46 @@
 <h2>Input</h2>
 
+<p>Include columns "Group", "officers", and "Table". Matching is done on "Group", so try to ensure that your names match the database's.</p>
+
 <form enctype="multipart/form-data" method="post" action="">
 {% csrf_token %}