ynerant/plateforme-tfjm2
1
0
Fork 0
mirror of https://gitlab.com/animath/si/plateforme.git synced 2024-12-26 05:42:22 +00:00
Code Issues Releases Wiki Activity

Merge branch 'dev' into 'master'

Browse Source 
Volunteers can add organizers

See merge request animath/si/plateforme-tfjm!18
This commit is contained in:
Yohann D'ANELLO 2021-02-06 18:31:20 +00:00
commit 12acb0ca26
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/registration/views.py
View File

@ -25,7 +25,7 @@ from django_tables2 import SingleTableView
from magic import Magic from magic import Magic
from participation.models import Passage, Solution, Synthesis, Tournament from participation.models import Passage, Solution, Synthesis, Tournament
from tfjm.tokens import email_validation_token from tfjm.tokens import email_validation_token
from tfjm.views import AdminMixin, UserMixin, UserRegistrationMixin, VolunteerMixin from tfjm.views import UserMixin, UserRegistrationMixin, VolunteerMixin
from .forms import AddOrganizerForm, AdminRegistrationForm, CoachRegistrationForm, HealthSheetForm, \ from .forms import AddOrganizerForm, AdminRegistrationForm, CoachRegistrationForm, HealthSheetForm, \
ParentalAuthorizationForm, PaymentForm, PhotoAuthorizationForm, SignupForm, StudentRegistrationForm, UserForm, \ ParentalAuthorizationForm, PaymentForm, PhotoAuthorizationForm, SignupForm, StudentRegistrationForm, UserForm, \
@ -254,7 +254,7 @@ class UserDetailView(LoginRequiredMixin, DetailView):
return context return context
class UserListView(AdminMixin, SingleTableView): class UserListView(VolunteerMixin, SingleTableView):
""" """
Display the list of all registered users. Display the list of all registered users.
""" """

2
tfjm/templates/base.html
View File

@ -60,7 +60,7 @@
<i class="fas fa-calendar-day"></i> {% trans "Tournaments" %} <i class="fas fa-calendar-day"></i> {% trans "Tournaments" %}
</a> </a>
</li> </li>
{% if user.is_authenticated and user.registration.is_admin %} {% if user.is_authenticated and user.registration.is_volunteer %}
<li class="nav-item active"> <li class="nav-item active">
<a href="{% url "registration:user_list" %}" class="nav-link"><i class="fas fa-user"></i> {% trans "Users" %}</a> <a href="{% url "registration:user_list" %}" class="nav-link"><i class="fas fa-user"></i> {% trans "Users" %}</a>
</li> </li>