reverted changes to export tests as well

core/tests/test_export.py

@@ -97,8 +97,13 @@ class ExportInstanceTest(APITestCase):
         self.client = APIClient()
         self.client.force_login(user=self.data['reviewers'][0])
         self.response = self.client.get('/api/instance/export/',
+<<<<<<< HEAD
                                         data={'setPasswords': True,
                                               'selected_exam': self.data['exams'][0].exam_type_id})
+=======
+                                         data={'setPasswords': True,
+                                               'selected_exam': self.data['exams'][0].exam_type_id})
+>>>>>>> 27c5fd7 (reverted changes to export tests as well)
 
     def test_can_access(self):
         self.assertEqual(status.HTTP_200_OK, self.response.status_code)

core/views/export.py

@@ -36,7 +36,7 @@ class StudentJSONExport(APIView):
         passwords = _set_student_passwords() if set_passwords else None
         selected_exam = request.data.get('selected_exam')
         result = ExamType.objects.get(exam_type_id=selected_exam)
-
+        
         content = [
             {'Matrikel': student.matrikel_no,
              'Name': student.user.fullname,