42CTF/website
42CTF
/
website
13
5
Fork 10
Code Issues 10 Pull Requests 1 Projects 9 Releases Wiki Activity

Merge branch 'events' into main

This commit is contained in:
Danhia 2022-01-14 23:42:53 +01:00
parent ceede3cfa0 a6095cc5c4
commit 40a7d4ebdd
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/events/templatetags/is_flagged.py
View File

@ -9,6 +9,8 @@ def isflagged(user, ctf):
flagged = False flagged = False
event_info = ctf.event event_info = ctf.event
if user.is_authenticated == False:
return ""
if event_info.team_size == 1: if event_info.team_size == 1:
if CTF_flags.objects.filter(user=user, ctf=ctf): if CTF_flags.objects.filter(user=user, ctf=ctf):
flagged = True flagged = True

8
src/events/views.py
View File

@ -223,9 +223,9 @@ def subscribe_to_event(request, event_slug):
@login_required @login_required
def create_team(request, event_slug): def create_team(request, event_slug):
response = redirect('events:create_team', event_slug=event_slug) response = redirect('events:create_team', event_slug=event_slug)
if request.method == 'POST':
if request.user.is_authenticated:
ev = get_object_or_404(Event, slug=event_slug) ev = get_object_or_404(Event, slug=event_slug)
if request.method == 'POST':
if request.user.is_authenticated and ev.team_size > 1:
if Team.objects.filter(name=request.POST.get('teamname'), event=ev).exists(): if Team.objects.filter(name=request.POST.get('teamname'), event=ev).exists():
return render(request, 'events/create_team.html', {'event' : ev, 'logged': True, 'wrongpwd': False, 'registered' : True, 'exist' : True}) return render(request, 'events/create_team.html', {'event' : ev, 'logged': True, 'wrongpwd': False, 'registered' : True, 'exist' : True})
new = Team(name=request.POST.get('teamname'), password=request.POST.get('password'), event=ev) new = Team(name=request.POST.get('teamname'), password=request.POST.get('password'), event=ev)
@ -238,9 +238,9 @@ def create_team(request, event_slug):
@login_required @login_required
def join_team(request, event_slug): def join_team(request, event_slug):
response = redirect('events:join_team', event_slug=event_slug) response = redirect('events:join_team', event_slug=event_slug)
if request.method == 'POST':
if request.user.is_authenticated:
ev = get_object_or_404(Event, slug=event_slug) ev = get_object_or_404(Event, slug=event_slug)
if request.method == 'POST':
if request.user.is_authenticated and ev.team_size > 1:
try: try:
team = Team.objects.get(name=request.POST.get('teamname'), event=ev) team = Team.objects.get(name=request.POST.get('teamname'), event=ev)
except: except: