forked from 42CTF/website
Merge pull request 'Limit events to certain campus' (#62) from events_campus into main
Reviewed-on: 42CTF/website#62 Reviewed-by: Danhia <danhia@protonmail.com>
This commit is contained in:
commit
7b9dfad15d
|
@ -0,0 +1,19 @@
|
||||||
|
# Generated by Django 3.2.11 on 2022-05-30 07:30
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('accounts', '0011_migration_campus'),
|
||||||
|
('events', '0009_auto_20220215_1706'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='event',
|
||||||
|
name='campus',
|
||||||
|
field=models.ManyToManyField(blank=True, to='accounts.Campus'),
|
||||||
|
),
|
||||||
|
]
|
|
@ -2,6 +2,7 @@ from django.db import models
|
||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from django.contrib.auth.models import timezone
|
from django.contrib.auth.models import timezone
|
||||||
import uuid
|
import uuid
|
||||||
|
from accounts.models import Campus
|
||||||
|
|
||||||
# Create your models here.
|
# Create your models here.
|
||||||
class Event(models.Model):
|
class Event(models.Model):
|
||||||
|
@ -17,6 +18,7 @@ class Event(models.Model):
|
||||||
team_size = models.PositiveIntegerField(default=1)
|
team_size = models.PositiveIntegerField(default=1)
|
||||||
auto_match = models.BooleanField(default=False)
|
auto_match = models.BooleanField(default=False)
|
||||||
dynamic = models.BooleanField(default=False)
|
dynamic = models.BooleanField(default=False)
|
||||||
|
campus = models.ManyToManyField(Campus, blank=True)
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.name
|
return self.name
|
||||||
|
|
||||||
|
|
|
@ -11,6 +11,21 @@
|
||||||
|
|
||||||
<div class="ctf-footer">
|
<div class="ctf-footer">
|
||||||
{% if logged == True %}
|
{% if logged == True %}
|
||||||
|
{% if userHasCampus == False %}
|
||||||
|
<span class="message error-msg">
|
||||||
|
{% trans "This event is reserved for one or more 42 campuses. If you have not connected your intranet to 42CTF, you can do so with this button: " %}
|
||||||
|
<form action="{% url 'accounts:connections-connect-intra42' %}" method='POST' class="form-inline p-2">
|
||||||
|
{%csrf_token%}
|
||||||
|
<button class="btn btn-dark" type="submit">{% trans "Connect 42" %}</button>
|
||||||
|
</form>
|
||||||
|
</span>
|
||||||
|
{% endif %}
|
||||||
|
{% if campusCanJoin == False %}
|
||||||
|
<span class="message error-msg">
|
||||||
|
{% trans "This event is reserved for one or more 42 campuses. And unfortunately your campus can't participate. Do not hesitate to contact us to organize an event on your campus!" %}
|
||||||
|
</span>
|
||||||
|
{% endif %}
|
||||||
|
{% if userHasCampus == True and campusCanJoin == True %}
|
||||||
{% if wrongpwd == True %}
|
{% if wrongpwd == True %}
|
||||||
<span class="message error-msg">{% trans "Wrong password submited." %}</span>
|
<span class="message error-msg">{% trans "Wrong password submited." %}</span>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
@ -24,6 +39,7 @@
|
||||||
<input type="text" name="password" maxlength="48" required="">
|
<input type="text" name="password" maxlength="48" required="">
|
||||||
<input class="form-control" type="submit" value=">">
|
<input class="form-control" type="submit" value=">">
|
||||||
</form>
|
</form>
|
||||||
|
{% endif %}
|
||||||
{% else %}
|
{% else %}
|
||||||
<h4>{% trans "You need to be logged to access this event." %}</h4>
|
<h4>{% trans "You need to be logged to access this event." %}</h4>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
|
@ -4,6 +4,7 @@ from django.contrib.auth.models import timezone
|
||||||
from ..forms import submit_flag
|
from ..forms import submit_flag
|
||||||
from ..models import Event, EventPlayer, Team
|
from ..models import Event, EventPlayer, Team
|
||||||
from ctfs.models import CTF, CTF_flags, Category
|
from ctfs.models import CTF, CTF_flags, Category
|
||||||
|
from accounts.models import UserProfileInfo
|
||||||
from django.utils.translation import get_language
|
from django.utils.translation import get_language
|
||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
|
@ -109,13 +110,23 @@ def event(request, event_slug):
|
||||||
player = None
|
player = None
|
||||||
if player:
|
if player:
|
||||||
IsRegistered = True
|
IsRegistered = True
|
||||||
|
if event_info.campus.all():
|
||||||
|
if request.user.is_authenticated:
|
||||||
|
if request.user.is_staff is False:
|
||||||
|
user = UserProfileInfo.objects.get(user=request.user)
|
||||||
|
if user.campus is None:
|
||||||
|
return render(request, 'events/event_pwd.html', {'event' : event_info, 'logged': True, 'wrongpwd': wrongpwd, 'alreadyregistered': alreadyregistered, 'userHasCampus': False, 'campusCanJoin': True})
|
||||||
|
elif user.campus not in event_info.campus.all():
|
||||||
|
return render(request, 'events/event_pwd.html', {'event' : event_info, 'logged': True, 'wrongpwd': wrongpwd, 'alreadyregistered': alreadyregistered, 'userHasCampus': True, 'campusCanJoin': False})
|
||||||
|
else:
|
||||||
|
return render(request, 'events/event_pwd.html', {'event' : event_info, 'logged': False, 'wrongpwd': wrongpwd, 'alreadyregistered': alreadyregistered, 'userHasCampus': True, 'campusCanJoin': True})
|
||||||
if event_info.password:
|
if event_info.password:
|
||||||
if request.user.is_authenticated:
|
if request.user.is_authenticated:
|
||||||
if request.user.is_staff is False:
|
if request.user.is_staff is False:
|
||||||
if not player:
|
if not player:
|
||||||
return render(request, 'events/event_pwd.html', {'event' : event_info, 'logged': True, 'wrongpwd': wrongpwd, 'alreadyregistered': alreadyregistered})
|
return render(request, 'events/event_pwd.html', {'event' : event_info, 'logged': True, 'wrongpwd': wrongpwd, 'alreadyregistered': alreadyregistered, 'userHasCampus': True, 'campusCanJoin': True})
|
||||||
else:
|
else:
|
||||||
return render(request, 'events/event_pwd.html', {'event' : event_info, 'logged': False, 'wrongpwd': wrongpwd, 'alreadyregistered': alreadyregistered})
|
return render(request, 'events/event_pwd.html', {'event' : event_info, 'logged': False, 'wrongpwd': wrongpwd, 'alreadyregistered': alreadyregistered, 'userHasCampus': True, 'campusCanJoin': True})
|
||||||
ended = False
|
ended = False
|
||||||
if timezone.now() >= event_info.end_date:
|
if timezone.now() >= event_info.end_date:
|
||||||
ended = True
|
ended = True
|
||||||
|
|
Loading…
Reference in New Issue