110swag / flashy-backend

Authored by Rohan Rangray 2015-05-20 13:36:34 -0700

Exists in master

Showing 2 changed files with 6 additions and 6 deletions Side-by-side Diff

...	...	@@ -171,8 +171,8 @@
171	171	material_date_begin = DateTimeField(default=QUARTER_START)
172	172	material_date_end = DateTimeField(default=QUARTER_END)
173	173
174		- def __init__(self, user, args, *kwargs):
175		- super(QuizRequestSerializer, self).__init__(args, *kwargs)
	174	+ def __init__(self, user, instance=None, data=empty, **kwargs):
	175	+ super(QuizRequestSerializer, self).__init__(instance=instance, data=data, **kwargs)
176	176	self.user = user
177	177	self.user_flashcard = None
178	178
...	...	@@ -257,9 +257,9 @@
257	257	response = CharField(required=False, max_length=255, help_text="The user's response")
258	258	correct = BooleanField(required=False, help_text="The user's self-evaluation of their response")
259	259
260		- def __init__(self, instance, data, **kwargs):
261		- assert isinstance(instance, UserFlashcardQuiz)
262		- super(QuizAnswerRequestSerializer, self).__init__(instance, data, **kwargs)
	260	+ def __init__(self, instance=None, data=empty, **kwargs):
	261	+ assert isinstance(instance, UserFlashcardQuiz) or instance is None
	262	+ super(QuizAnswerRequestSerializer, self).__init__(instance=instance, data=data, **kwargs)
263	263
264	264	def validate_response(self, response):
265	265	if response is None:

...	...	@@ -350,7 +350,7 @@
350	350	:param format: Format of the request.
351	351	:return: A response containing
352	352	"""
353		- serializer = QuizRequestSerializer(data=request.data)
	353	+ serializer = QuizRequestSerializer(user=request.user, data=request.data)
354	354	serializer.is_valid(raise_exception=True)
355	355	user_flashcard_quiz = serializer.create(serializer.validated_data)
356	356	mask = sample(user_flashcard_quiz.user_flashcard.mask.get_random_blank(), 1)