Merge branch '107-favoritensystem-verbessern' into 'master'
Resolve "Favoritensystem verbessern" Closes #107 See merge request enrichment-2024/qivip!52
This commit is contained in:
@@ -176,24 +176,18 @@ def favorite_quiz(request, pk):
|
|||||||
|
|
||||||
statement="Das Quiz '"+ favorite.quiz.name+ "' wurde erfolgreich zu den Favoriten hinzugefügt!"
|
statement="Das Quiz '"+ favorite.quiz.name+ "' wurde erfolgreich zu den Favoriten hinzugefügt!"
|
||||||
messages.success(request,statement )
|
messages.success(request,statement )
|
||||||
|
favorite.save()
|
||||||
else:
|
else:
|
||||||
favorite.favorite_date = None
|
favorite.favorite_date = None
|
||||||
|
favorite.delete()
|
||||||
statement="Das Quiz '"+ favorite.quiz.name+ "' wurde erfolgreich von den Favoriten entfernt!"
|
statement="Das Quiz '"+ favorite.quiz.name+ "' wurde erfolgreich von den Favoriten entfernt!"
|
||||||
messages.error(request, statement)
|
messages.error(request, statement)
|
||||||
|
|
||||||
favorite.save()
|
|
||||||
else:
|
else:
|
||||||
QivipQuizFavorite.objects.create(user=request.user, quiz=quiz, favorite=True, favorite_date=timezone.now())
|
QivipQuizFavorite.objects.create(user=request.user, quiz=quiz, favorite=True, favorite_date=timezone.now())
|
||||||
"""
|
|
||||||
referer = request.META.get('HTTP_REFERER')
|
|
||||||
if referer and 'library/' in referer:
|
|
||||||
|
|
||||||
return redirect(request.META.get('HTTP_REFERER', 'library:overview_quiz'))
|
return redirect(request.META.get('HTTP_REFERER', 'library:overview_quiz'))
|
||||||
else:
|
|
||||||
return overview_quiz(request)
|
|
||||||
"""
|
|
||||||
return redirect(request.META.get('HTTP_REFERER', 'library:overview_quiz'))
|
|
||||||
|
|
||||||
|
|
||||||
# Neues Quiz erstellen
|
# Neues Quiz erstellen
|
||||||
@@ -255,33 +249,7 @@ def detail_quiz(request, pk):
|
|||||||
'detail':show_answers,
|
'detail':show_answers,
|
||||||
}
|
}
|
||||||
return render(request, 'library/detail_quiz.html', context)
|
return render(request, 'library/detail_quiz.html', context)
|
||||||
"""
|
|
||||||
def modified(request, pk):
|
|
||||||
|
|
||||||
original_quiz = get_object_or_404(QivipQuiz, pk=pk)
|
|
||||||
words=original_quiz.modified_description.split()
|
|
||||||
word_exist=0
|
|
||||||
print(original_quiz.creator.username)
|
|
||||||
print(request.user.username)
|
|
||||||
|
|
||||||
for word in words:
|
|
||||||
|
|
||||||
if word==request.user.username or word+","==request.user.username:
|
|
||||||
word_exist=1
|
|
||||||
|
|
||||||
|
|
||||||
if word_exist==0 and len(words)!=0 and request.user.username!=original_quiz.creator.username:
|
|
||||||
original_quiz.modified_description +=", "+ request.user.username
|
|
||||||
|
|
||||||
|
|
||||||
elif word_exist==0 and request.user.username!=original_quiz.creator.username:
|
|
||||||
original_quiz.modified_description +=" "+ request.user.username
|
|
||||||
|
|
||||||
original_quiz.save()
|
|
||||||
|
|
||||||
return redirect('library:detail_quiz', pk=pk)
|
|
||||||
|
|
||||||
"""
|
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
def copy_quiz(request, pk):
|
def copy_quiz(request, pk):
|
||||||
|
|||||||
Reference in New Issue
Block a user