src/accounts/templates/accounts/register.html

@@ -7,6 +7,7 @@
         <div class="ctf-head">
             <h3>Register</h3>
         </div>
+
         <div class="ctf-body sign-body">
             <div class="col-sm-8 col-md-6 mx-auto">
                 {% if registered %}
@@ -30,7 +31,7 @@
             </div>
         </div>
     </div>
-	</div>
+
     <div class="col-sm-12 col-md-3 right-sidebar">
         <ul class="list-group">
             <a href="/accounts/signup" class="list-group-item">{% trans "Sign up" %}</a>
@@ -39,3 +40,4 @@
     </div>
 </div>
 {% endblock %}
+

src/accounts/views/views.py

@@ -188,7 +188,7 @@ def profile(request, user_name):
 	for s in solves.reverse():
 		somme += s.ctf.points
 		solved.append([s.flag_date.timestamp() * 1000,somme])
-	created = CTF.objects.filter(author=user_obj, event=None)
+	created = CTF.objects.filter(author=user_obj)
 	return render(request,'accounts/profile.html', {'user':user_obj, 'solves':solves,'solved':solved,'catsDatas': catsDatas, 'pointDatas': pointDatas,
 		'rank': rank, 'score' : somme, 'member' : member, 'cats':cats, 'created':created})
 

src/events/migrations/0010_event_campus.py

@@ -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'),
-        ),
-    ]

src/events/models.py

@@ -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
 

src/events/templates/events/event_pwd.html

@@ -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 %}

src/events/views/events.py

@@ -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