Merge branch '127-suchfunktion-verbessern' into 'master'
Resolve "Suchfunktion verbessern" Closes #127 See merge request enrichment-2024/qivip!85
This commit is contained in:
@@ -21,11 +21,21 @@ def quiz_names_json(request):
|
|||||||
form = QuizFilterForm(request.GET)
|
form = QuizFilterForm(request.GET)
|
||||||
if form.is_valid():
|
if form.is_valid():
|
||||||
search = form.cleaned_data.get('search')
|
search = form.cleaned_data.get('search')
|
||||||
names = list(
|
|
||||||
QivipQuiz.objects.all().annotate(max_amout_questions=Count('questions')).filter(max_amout_questions__gte=1, status='öffentlich', name__icontains=search)
|
|
||||||
.values_list('name', flat=True)
|
names = QivipQuiz.objects.all().annotate(max_amout_questions=Count('questions')).filter(max_amout_questions__gte=1, status='öffentlich', name__icontains=search)
|
||||||
.distinct()
|
|
||||||
)
|
|
||||||
|
if request.user.is_authenticated:
|
||||||
|
names = names | QivipQuiz.objects.filter(
|
||||||
|
user_id=request.user.id,
|
||||||
|
status='privat',
|
||||||
|
name__icontains=search
|
||||||
|
)
|
||||||
|
|
||||||
|
names=list(names.values_list('name', flat=True).distinct())
|
||||||
|
|
||||||
|
|
||||||
return JsonResponse(names, safe=False)
|
return JsonResponse(names, safe=False)
|
||||||
|
|
||||||
def overview_quiz(request):
|
def overview_quiz(request):
|
||||||
|
|||||||
Reference in New Issue
Block a user