Merge branch 'hotfix/2.2.6'

CHANGELOG.rst

@@ -2,20 +2,30 @@
 Change Log
 ==========
 
+2.2.6
+-----
+*Release date: 14 November 2018*
+
+- Fix issue where check-ins could not be revoked
+- Fix issue where the standings overview 'dashboard' included scores from elimination rounds. Thanks to Étienne for this fix
+- Fix issue where the Average Individual Speaker Score metric would fail to calculate in some circumstances. Thanks to Étienne for this fix
+- Fix issue where draw emails would crash if venues were unspecified. Thanks, again, to Étienne for this fix!
+
+
 2.2.5
 -----
 *Release date: 21 October 2018*
 
 - Remove the buttons from the public check-ins page (as these do nothing unless the user is logged in)
 - Hopefully fixed error that could cause Team- and Adjudicator- Institutional conflicts to not show properly on Allocation pages
-- Thanks to Étienne for pull requests fixing rare bugs in the user creation form and break generation when rounds are not present.
+- Thanks to Étienne for pull requests fixing rare bugs in the user creation form and break generation when rounds are not present
 
 
 2.2.4
 -----
 *Release date: 09 October 2018*
 
-- Small fixes for functions related to email sending, conflict highlighting, and certain configurations of standings metrics.
+- Small fixes for functions related to email sending, conflict highlighting, and certain configurations of standings metrics
 
 
 2.2.3

docs/conf.py

@@ -60,7 +60,7 @@
 # The short X.Y version.
 version = '2.2'
 # The full version, including alpha/beta/rc tags.
-release = '2.2.5'
+release = '2.2.6'
 
 rst_epilog = """
 .. |vrelease| replace:: v{release}

tabbycat/draw/utils.py

@@ -63,7 +63,7 @@ def _assemble_panel(adjs):
         matchup = debate.matchup_codes if use_codes else debate.matchup
         context = {
             'ROUND': round.name,
-            'VENUE': debate.venue.name,
+            'VENUE': debate.venue.name if hasattr(debate, 'venue') else _("TBA"),
             'PANEL': _assemble_panel(debate.adjudicators.with_positions()),
             'DRAW': matchup
         }

tabbycat/settings.py

@@ -21,9 +21,9 @@
 # Version
 # ==============================================================================
 
-TABBYCAT_VERSION = '2.2.5'
+TABBYCAT_VERSION = '2.2.6'
 TABBYCAT_CODENAME = 'Khao Manee'
-READTHEDOCS_VERSION = 'v2.2.5'
+READTHEDOCS_VERSION = 'v2.2.6'
 
 # ==============================================================================
 # Internationalization and Localization
@@ -312,6 +312,14 @@
     },
 }
 
+# ==============================================================================
+# Dynamic preferences
+# ==============================================================================
+
+DYNAMIC_PREFERENCES = {
+    'REGISTRY_MODULE': 'preferences',
+}
+
 # ==============================================================================
 # Heroku
 # ==============================================================================

tabbycat/standings/teams.py

@@ -175,13 +175,29 @@ def get_annotation(self, round=None):
         annotation_filter = Q(
             debateteam__teamscore__ballot_submission__confirmed=True,
             debateteam__debate__round__stage=Round.STAGE_PRELIMINARY,
-            debateteam__teamscore__forfeit=False
+            debateteam__teamscore__forfeit=False,
+            debateteam__speakerscore__ghost=False
         )
         if round is not None:
-            annotation_filter &= Q(debateteam__speakerscore__position__lte=round.tournament.last_substantive_position)
+            annotation_filter &= Q(debateteam__debate__round__seq__lte=round.seq)
+
+        # `self.tournament` is only None if `queryset.first()` was None (see
+        # `get_annotated_queryset()` below), in which case the filter doesn't
+        # matter because the queryset is empty anyway.
+        if self.tournament is not None:
+            annotation_filter &= Q(debateteam__speakerscore__position__lte=self.tournament.last_substantive_position)
 
         return Avg('debateteam__speakerscore__score', filter=annotation_filter)
 
+    def get_annotated_queryset(self, queryset, column_name, round=None):
+        if round is not None:
+            self.tournament = round.tournament
+        else:
+            first_team = queryset.first()
+            self.tournament = first_team.tournament if first_team is not None else None
+
+        return super().get_annotated_queryset(queryset, column_name, round)
+
 
 class DrawStrengthMetricAnnotator(BaseMetricAnnotator):
     """Metric annotator for draw strength."""

tabbycat/standings/views.py

@@ -67,6 +67,7 @@ def get_context_data(self, **kwargs):
             'debate_team__team__institution'
         )
         if self.tournament.pref('teams_in_debate') == 'bp':
+            team_scores.filter(debate_team__debate__round__stage=Round.STAGE_PRELIMINARY)
             kwargs["top_team_scores"] = team_scores.order_by('-score')[:9]
             kwargs["bottom_team_scores"] = team_scores.order_by('score')[:9]
         else: