{% endif %}
{% haspermission "view.answers" as answers_perm %}
+ {% haspermission "add.team" as add_team_perm %}
+ {% haspermission "delete.speaker" as delete_speaker_perm %}
{% if admin_page and answers_perm %}
@@ -126,7 +133,6 @@
{% for speaker in team.speakers %}
{{ speaker.name }}
-
{% for answer in speaker.answers.all %}
- {{ answer.question.name }}: {{ answer.answer }}
@@ -136,6 +142,33 @@
{% endfor %}
+ {% endif %}
+
+ {% if admin_page and add_team_perm %}
+
+
+ {% trans "Speakers:" %}
+
+ {% for speaker in team.speakers %}
+
+ {% endfor %}
+
+
diff --git a/tabbycat/participants/urls_admin.py b/tabbycat/participants/urls_admin.py
index 4257186ae9e..adf3e67cdd4 100644
--- a/tabbycat/participants/urls_admin.py
+++ b/tabbycat/participants/urls_admin.py
@@ -36,6 +36,12 @@
path('team//',
views.TeamRecordView.as_view(),
name='participants-team-record'),
+ path('team//speaker/add/',
+ views.AdminCreateSpeakerView.as_view(),
+ name='participants-team-speaker-add'),
+ path('team//speaker//delete/',
+ views.AdminDeleteSpeakerView.as_view(),
+ name='participants-team-speaker-delete'),
path('adjudicator//',
views.AdjudicatorRecordView.as_view(),
name='participants-adjudicator-record'),
diff --git a/tabbycat/participants/views.py b/tabbycat/participants/views.py
index 4e2af155784..9c66bcfacbe 100644
--- a/tabbycat/participants/views.py
+++ b/tabbycat/participants/views.py
@@ -13,6 +13,7 @@
from django.utils.html import escape
from django.utils.translation import gettext as _, gettext_lazy, ngettext
from django.views.generic.base import View
+from django.views.generic.edit import FormView
from actionlog.mixins import LogActionMixin
from actionlog.models import ActionLogEntry
@@ -23,6 +24,7 @@
from notifications.models import BulkNotification
from notifications.views import TournamentTemplateEmailCreateView
from options.utils import use_team_code_names
+from registration.forms import AdminSpeakerForm
from tournaments.mixins import (PublicTournamentPageMixin,
SingleObjectFromTournamentMixin, TournamentMixin)
from tournaments.models import Round
@@ -32,6 +34,7 @@
from utils.tables import TabbycatTableBuilder
from utils.views import ModelFormSetView, VueTableTemplateView
+from .forms import ConfirmSpeakerDeletionForm
from .models import Adjudicator, Institution, Person, Speaker, SpeakerCategory, Team
from .serializers import SpeakerSerializer
from .tables import AdjudicatorDebateTable, TeamDebateTable
@@ -364,6 +367,86 @@ def get_queryset(self):
)
+class AdminCreateSpeakerView(LogActionMixin, AdministratorMixin, TournamentMixin, FormView):
+ template_name = 'speaker_create.html'
+ action_log_type = ActionLogEntry.ActionType.SPEAKER_CREATE
+ edit_permission = Permission.ADD_TEAMS
+ form_class = AdminSpeakerForm
+
+ def get_team(self):
+ if not hasattr(self, '_team'):
+ self._team = Team.objects.get(tournament=self.tournament, pk=self.kwargs['pk'])
+ return self._team
+
+ def get_form_kwargs(self):
+ kwargs = super().get_form_kwargs()
+ kwargs['team'] = self.get_team()
+ return kwargs
+
+ def get_action_log_content_object(self):
+ return self.object
+
+ def get_page_title(self):
+ return _("Add Speaker to %(team)s") % {'team': self.get_team().short_name}
+
+ def get_context_data(self, **kwargs):
+ kwargs['team'] = self.get_team()
+ kwargs['team_record_url'] = reverse_tournament('participants-team-record', self.tournament, kwargs={'pk': self.get_team().pk})
+ kwargs['cancel_text'] = _("Cancel and return to team record")
+ return super().get_context_data(**kwargs)
+
+ def form_valid(self, form):
+ self.object = form.save()
+ messages.success(self.request, _("%(name)s was added as a speaker.") % {'name': self.object.name})
+ return super().form_valid(form)
+
+ def get_success_url(self):
+ return reverse_tournament('participants-team-record', self.tournament, kwargs={'pk': self.get_team().pk})
+
+
+class AdminDeleteSpeakerView(LogActionMixin, AdministratorMixin, TournamentMixin, FormView):
+ template_name = 'speaker_confirm_delete.html'
+ action_log_type = ActionLogEntry.ActionType.SPEAKER_DELETE
+ edit_permission = Permission.DELETE_SPEAKER
+ form_class = ConfirmSpeakerDeletionForm
+
+ def get_speaker(self):
+ if not hasattr(self, '_speaker'):
+ self._speaker = Speaker.objects.select_related('team__tournament').get(
+ pk=self.kwargs['speaker_pk'], team__tournament=self.tournament,
+ )
+ return self._speaker
+
+ def get_form_kwargs(self):
+ kwargs = super().get_form_kwargs()
+ kwargs['speaker'] = self.get_speaker()
+ return kwargs
+
+ def get_action_log_content_object(self):
+ return self.object
+
+ def get_page_title(self):
+ return _("Delete %(name)s") % {'name': self.get_speaker().name}
+
+ def get_context_data(self, **kwargs):
+ kwargs['speaker'] = self.get_speaker()
+ kwargs['team'] = self.get_speaker().team
+ return super().get_context_data(**kwargs)
+
+ def form_valid(self, form):
+ self.object = self.get_speaker()
+ team_pk = self.object.team_id
+ speaker_name = self.object.name
+ self.log_action()
+ self.object.delete()
+ messages.success(self.request, _("%(name)s was deleted.") % {'name': speaker_name})
+ return redirect_tournament('participants-team-record', self.tournament, pk=team_pk)
+
+ def get_success_url(self):
+ return reverse_tournament('participants-team-record', self.tournament,
+ kwargs={'pk': self.get_speaker().team_id})
+
+
class AdjudicatorRecordView(AdministratorMixin, BaseAdjudicatorRecordView):
admin = True
view_permission = Permission.VIEW_ADJUDICATORS
diff --git a/tabbycat/registration/forms.py b/tabbycat/registration/forms.py
index cf03a7c9fdb..09ea0b0a6b8 100644
--- a/tabbycat/registration/forms.py
+++ b/tabbycat/registration/forms.py
@@ -257,6 +257,23 @@ def save(self, commit=True):
return obj
+class AdminSpeakerForm(forms.ModelForm):
+
+ def __init__(self, *args, team=None, **kwargs):
+ self.team = team
+ super().__init__(*args, **kwargs)
+
+ class Meta:
+ model = Speaker
+ fields = ('name', 'email')
+
+ def save(self, commit=True):
+ self.instance.team = self.team
+ obj = super().save(commit=commit)
+ populate_url_keys([obj])
+ return obj
+
+
class AdjudicatorForm(CustomQuestionsFormMixin, forms.ModelForm):
key = forms.CharField(widget=forms.HiddenInput(), required=False)
diff --git a/tabbycat/users/groups.py b/tabbycat/users/groups.py
index 551e0d8e09b..67fd11409e7 100644
--- a/tabbycat/users/groups.py
+++ b/tabbycat/users/groups.py
@@ -137,6 +137,7 @@ class Registration(BaseGroup):
name = _("Registration")
permissions = [
Permission.ADD_TEAMS,
+ Permission.DELETE_SPEAKER,
Permission.VIEW_DECODED_TEAMS,
Permission.VIEW_ANONYMOUS,
Permission.ADD_ADJUDICATORS,
diff --git a/tabbycat/users/permissions.py b/tabbycat/users/permissions.py
index ef1868076aa..042fe36cfc1 100644
--- a/tabbycat/users/permissions.py
+++ b/tabbycat/users/permissions.py
@@ -28,6 +28,7 @@ class Permission(TextChoices):
VIEW_TEAMS = 'view.team', _("view teams")
ADD_TEAMS = 'add.team', _("add teams")
+ DELETE_SPEAKER = 'delete.speaker', _("delete speakers")
VIEW_DECODED_TEAMS = 'view.teamname', _("view decoded team names")
VIEW_ANONYMOUS = 'view.anonymous', _("View names of anonymized participants")
VIEW_ADJUDICATORS = 'view.adj', _("view adjudicators")