Danhia
/
website
forked from 42CTF/website
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed case where a category has no challenge in an event and profile crash

This commit is contained in:
Danhia 2022-01-02 21:41:32 +01:00
parent 8a2dd4dc80
commit afbe7f2430
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/events/views.py
View File

@ -265,7 +265,8 @@ def profile(request, user_name, event_slug):
player = EventPlayer.objects.get(user=user_obj, event=event_info) player = EventPlayer.objects.get(user=user_obj, event=event_info)
all_players = list(EventPlayer.objects.filter(event=event_info).order_by('-score', 'last_submission_date', 'user__username')) all_players = list(EventPlayer.objects.filter(event=event_info).order_by('-score', 'last_submission_date', 'user__username'))
rank = all_players.index(get_object_or_404(EventPlayer, user=user_obj, event=event_info)) + 1 rank = all_players.index(get_object_or_404(EventPlayer, user=user_obj, event=event_info)) + 1
cats = Category.objects.all() all_cats = Category.objects.all()
cats = [cat for cat in all_cats if CTF.objects.filter(category__name=cat.name, event=event_info)]
pointDatas = {} pointDatas = {}
for cat in cats: for cat in cats:
@ -291,7 +292,8 @@ def profile(request, user_name, event_slug):
somme += s.ctf.points somme += s.ctf.points
solved.append([s.flag_date.timestamp() * 1000,somme]) solved.append([s.flag_date.timestamp() * 1000,somme])
return render(request,'accounts/profile.html', {'user':user_obj, 'solves':solves,'solved':solved,'catsDatas': catsDatas, 'pointDatas': pointDatas, 'rank': rank, 'score' : somme}) return render(request,'accounts/profile.html', {'user':user_obj, 'solves':solves,'solved':solved,'catsDatas': catsDatas, 'pointDatas': pointDatas,
'rank': rank, 'score' : somme, 'cats':cats})
@login_required @login_required
def team_info(request, name, event_slug): def team_info(request, name, event_slug):
@ -304,7 +306,8 @@ def team_info(request, name, event_slug):
users = [p.user for p in players] users = [p.user for p in players]
all_teams = list(Team.objects.filter(event=event_info).order_by('-score', 'last_submission_date', 'name')) all_teams = list(Team.objects.filter(event=event_info).order_by('-score', 'last_submission_date', 'name'))
rank = all_teams.index(get_object_or_404(Team, id=team.id, event=event_info)) + 1 rank = all_teams.index(get_object_or_404(Team, id=team.id, event=event_info)) + 1
cats = Category.objects.all() all_cats = Category.objects.all()
cats = [cat for cat in all_cats if CTF.objects.filter(category__name=cat.name, event=event_info)]
pointDatas = {} pointDatas = {}
for cat in cats: for cat in cats:
@ -339,7 +342,7 @@ def team_info(request, name, event_slug):
solved.append([s.flag_date.timestamp() * 1000,somme]) solved.append([s.flag_date.timestamp() * 1000,somme])
return render(request,'events/team.html', {'users':users, 'solves':solves,'solved':solved,'catsDatas': catsDatas, 'pointDatas': pointDatas, return render(request,'events/team.html', {'users':users, 'solves':solves,'solved':solved,'catsDatas': catsDatas, 'pointDatas': pointDatas,
'rank': rank, 'team':team, 'score':somme, 'event':event_info}) 'rank': rank, 'team':team, 'score':somme, 'event':event_info, 'cats':cats})
@login_required @login_required
def manage_team(request, event_slug): def manage_team(request, event_slug):