Compare commits
No commits in common. "7b9dfad15d2cd78f9861275679a7d8129158e013" and "a1ec3e5f20016c4511c5207128abc1c0407784d8" have entirely different histories.
7b9dfad15d
...
a1ec3e5f20
|
@ -1,19 +0,0 @@
|
|||
# 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,7 +2,6 @@ from django.db import models
|
|||
from django.contrib.auth.models import User
|
||||
from django.contrib.auth.models import timezone
|
||||
import uuid
|
||||
from accounts.models import Campus
|
||||
|
||||
# Create your models here.
|
||||
class Event(models.Model):
|
||||
|
@ -18,7 +17,6 @@ class Event(models.Model):
|
|||
team_size = models.PositiveIntegerField(default=1)
|
||||
auto_match = models.BooleanField(default=False)
|
||||
dynamic = models.BooleanField(default=False)
|
||||
campus = models.ManyToManyField(Campus, blank=True)
|
||||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
|
|
|
@ -11,21 +11,6 @@
|
|||
|
||||
<div class="ctf-footer">
|
||||
{% 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 %}
|
||||
<span class="message error-msg">{% trans "Wrong password submited." %}</span>
|
||||
{% endif %}
|
||||
|
@ -39,7 +24,6 @@
|
|||
<input type="text" name="password" maxlength="48" required="">
|
||||
<input class="form-control" type="submit" value=">">
|
||||
</form>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
<h4>{% trans "You need to be logged to access this event." %}</h4>
|
||||
{% endif %}
|
||||
|
|
|
@ -4,7 +4,6 @@ from django.contrib.auth.models import timezone
|
|||
from ..forms import submit_flag
|
||||
from ..models import Event, EventPlayer, Team
|
||||
from ctfs.models import CTF, CTF_flags, Category
|
||||
from accounts.models import UserProfileInfo
|
||||
from django.utils.translation import get_language
|
||||
from django.contrib.auth.models import User
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
|
@ -110,23 +109,13 @@ def event(request, event_slug):
|
|||
player = None
|
||||
if player:
|
||||
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 request.user.is_authenticated:
|
||||
if request.user.is_staff is False:
|
||||
if not player:
|
||||
return render(request, 'events/event_pwd.html', {'event' : event_info, 'logged': True, 'wrongpwd': wrongpwd, 'alreadyregistered': alreadyregistered, 'userHasCampus': True, 'campusCanJoin': True})
|
||||
return render(request, 'events/event_pwd.html', {'event' : event_info, 'logged': True, 'wrongpwd': wrongpwd, 'alreadyregistered': alreadyregistered})
|
||||
else:
|
||||
return render(request, 'events/event_pwd.html', {'event' : event_info, 'logged': False, 'wrongpwd': wrongpwd, 'alreadyregistered': alreadyregistered, 'userHasCampus': True, 'campusCanJoin': True})
|
||||
return render(request, 'events/event_pwd.html', {'event' : event_info, 'logged': False, 'wrongpwd': wrongpwd, 'alreadyregistered': alreadyregistered})
|
||||
ended = False
|
||||
if timezone.now() >= event_info.end_date:
|
||||
ended = True
|
||||
|
|
Loading…
Reference in New Issue