+
{% for tournament in tournaments %}
{% include 'tournaments/tournament_row.html' %}
diff --git a/tournaments/templatetags/__init__.py b/tournaments/templatetags/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tournaments/templatetags/tournament_tags.py b/tournaments/templatetags/tournament_tags.py
new file mode 100644
index 0000000..072fd07
--- /dev/null
+++ b/tournaments/templatetags/tournament_tags.py
@@ -0,0 +1,7 @@
+from django import template
+
+register = template.Library()
+
+@register.filter
+def get_player_status(tournament, user):
+ return tournament.get_player_registration_status_by_licence(user)
diff --git a/tournaments/urls.py b/tournaments/urls.py
index f544567..e0a49bb 100644
--- a/tournaments/urls.py
+++ b/tournaments/urls.py
@@ -55,13 +55,7 @@ urlpatterns = [
path('utils/xls-to-csv/', views.xls_to_csv, name='xls-to-csv'),
path('mail-test/', views.simple_form_view, name='mail-test'),
path('login/', CustomLoginView.as_view(), name='custom-login'),
- path('password_change/',
- auth_views.PasswordChangeView.as_view(
- success_url='/profile/', # Redirect back to profile after success
- form_class=CustomPasswordChangeForm
- ),
- name='password_change'
- ),
+ path('custom_password_change/', views.custom_password_change, name='custom_password_change'),
path('logout/', views.custom_logout, name='custom_logout'),
path('signup/', views.signup, name='signup'), # URL pattern for signup
# path('profile/', views.profile, name='profile'), # URL pattern for signup
@@ -70,7 +64,9 @@ urlpatterns = [
path('tournaments//unregister/', views.unregister_tournament, name='unregister_tournament'),
path('password_reset/', auth_views.PasswordResetView.as_view(), name='password_reset'),
path('password_reset_done/', auth_views.PasswordResetDoneView.as_view(), name='password_reset_done'),
- path('reset/done/', auth_views.PasswordResetCompleteView.as_view(), name='password_reset_complete'),
+ path('reset/done/',
+ views.CustomPasswordResetCompleteView.as_view(),
+ name='password_reset_complete'),
path('profile/', views.ProfileUpdateView.as_view(), name='profile'),
path('admin/tournament-import/', views.tournament_import_view, name='tournament_import'),
path('admin/status/', views.status_page, name='status_page'),
diff --git a/tournaments/views.py b/tournaments/views.py
index a3dfa5f..14990c6 100644
--- a/tournaments/views.py
+++ b/tournaments/views.py
@@ -2,6 +2,11 @@
import os
import csv
+from django.contrib.auth import update_session_auth_hash
+from django.contrib.auth.views import PasswordResetCompleteView
+from django.shortcuts import redirect
+from django.contrib.auth import login
+from django.contrib.auth import get_user_model
from django.shortcuts import render, get_object_or_404
from django.http import JsonResponse, HttpResponse
from django.utils.encoding import force_str
@@ -818,6 +823,54 @@ class CustomPasswordResetConfirmView(PasswordResetConfirmView):
except (TypeError, ValueError, User.DoesNotExist):
raise Http404("User not found")
+class CustomPasswordResetCompleteView(PasswordResetCompleteView):
+ template_name = 'registration/password_reset_complete.html'
+
+ def get(self, request, *args, **kwargs):
+ # Get the user from the session
+ username = request.session.get('reset_username')
+
+ if username:
+ try:
+ # Get the user
+ User = get_user_model()
+ user = User.objects.get(username=username)
+
+ # Log the user in
+ login(request, user, backend='django.contrib.auth.backends.ModelBackend')
+
+ # Clean up the session
+ if 'reset_username' in request.session:
+ del request.session['reset_username']
+
+ # Redirect to the profile page
+ return redirect('profile')
+ except User.DoesNotExist:
+ pass
+
+ # If no username in session or user not found, proceed with normal view
+ return super().get(request, *args, **kwargs)
+
+@login_required
+def custom_password_change(request):
+ if request.method == 'POST':
+ form = CustomPasswordChangeForm(user=request.user, data=request.POST)
+ if form.is_valid():
+ user = form.save()
+ update_session_auth_hash(request, user) # Important to keep user logged in
+ messages.success(request, 'Votre mot de passe a été mis à jour avec succès!')
+ return redirect('profile')
+ else:
+ # Form is invalid, show errors
+ profile_form = ProfileUpdateForm(instance=request.user)
+ return render(request, 'profile.html', {
+ 'form': profile_form,
+ 'password_change_form': form
+ })
+
+ # If not POST, redirect to profile page
+ return redirect('profile')
+
@login_required
def my_tournaments(request):
user = request.user