.
This commit is contained in:
+7
-5
@@ -77,7 +77,9 @@ class RapidForm(ModelForm):
|
|||||||
js = ["jsi18n.js", "tesseract.min.js"]
|
js = ["jsi18n.js", "tesseract.min.js"]
|
||||||
|
|
||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
self.user = kwargs.pop('user') # To get request.user. Do not use kwargs.pop('user', None) due to potential security hole
|
self.user = kwargs.pop(
|
||||||
|
"user"
|
||||||
|
) # To get request.user. Do not use kwargs.pop('user', None) due to potential security hole
|
||||||
if kwargs.get("instance"):
|
if kwargs.get("instance"):
|
||||||
# We get the 'initial' keyword argument or initialize it
|
# We get the 'initial' keyword argument or initialize it
|
||||||
# as a dict if it didn't exist.
|
# as a dict if it didn't exist.
|
||||||
@@ -115,8 +117,9 @@ class RapidForm(ModelForm):
|
|||||||
if self.user.groups.filter(name="rapid_checker").exists():
|
if self.user.groups.filter(name="rapid_checker").exists():
|
||||||
exam_queryset = Exam.objects.all()
|
exam_queryset = Exam.objects.all()
|
||||||
else:
|
else:
|
||||||
exam_queryset = Exam.objects.filter(author__id=self.user.id) | Exam.objects.filter(open_access=True)
|
exam_queryset = Exam.objects.filter(
|
||||||
|
author__id=self.user.id
|
||||||
|
) | Exam.objects.filter(open_access=True)
|
||||||
|
|
||||||
self.fields["exams"] = ModelMultipleChoiceField(
|
self.fields["exams"] = ModelMultipleChoiceField(
|
||||||
required=False,
|
required=False,
|
||||||
@@ -133,7 +136,6 @@ class RapidForm(ModelForm):
|
|||||||
# exam = Exam.objects.get(pk=exam_pk)
|
# exam = Exam.objects.get(pk=exam_pk)
|
||||||
exam.exam_questions.add(instance)
|
exam.exam_questions.add(instance)
|
||||||
|
|
||||||
|
|
||||||
# # Prepare a 'save_m2m' method for the form,
|
# # Prepare a 'save_m2m' method for the form,
|
||||||
# old_save_m2m = self.save_m2m
|
# old_save_m2m = self.save_m2m
|
||||||
#
|
#
|
||||||
@@ -149,7 +151,7 @@ class RapidForm(ModelForm):
|
|||||||
# # Do we need to save all changes now?
|
# # Do we need to save all changes now?
|
||||||
# # if commit:
|
# # if commit:
|
||||||
# instance.save()
|
# instance.save()
|
||||||
# self.save_m2m()
|
self.save_m2m()
|
||||||
|
|
||||||
return instance
|
return instance
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user