Merge branch 'hotfix/2.11.1'

Author: tienne-B

.github/CHANGELOG.rst

@@ -2,6 +2,26 @@
 Change Log
 ==========
 
+2.11.1
+------
+*Release date: 2 March 2026*
+
+- Avoid merging ballots based on trainee submissions
+- Avoid sending password reset email on user invitation
+- Remove extraneous HTML when copying into Summernote
+- Fix error on motion/info-slide release
+- Avoid sending push notifications if not configured and fail silently
+- Add validation against setting graph-only pullup option; add error when using draw strength in Australs PP
+- Fix adjudicators disappearing from allocation screen in public speaking tournaments
+- Only show 'Release info-slide' button if round has info-slide
+- Skip teams that are not in standings when calculating draw strength
+- Set sides for bye debates when prefetching; skip adding results for bye debates in commands
+- Avoid crashing when creating tournaments due to blank required FKs
+- Fix duplicate header keys in registration institution table
+- Fix JQuery not being loaded in time; fix checkbox table checks not registering; use form-based submission where possible
+- Fix typo in preferences. Thank you to Polyxeni Damigou for their PR! (#2822)
+
+
 2.11.0 (Tonkinese)
 ------------------
 *Release date: 9 November 2025*

docs/conf.py

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

tabbycat/adjallocation/templates/EditDebateAdjudicatorsContainer.vue

@@ -106,7 +106,7 @@ export default {
   }),
   computed: {
     maxTeams: function () {
-      return Math.max(...this.sortedDebatesOrPanels.map(d => d.teams.length))
+      return Math.max(...this.sortedDebatesOrPanels.map(d => d.teams ? d.teams.length : 0), 2)
     },
     groupedDebatesByRound: function () {
       // Group already-sorted debates by their round for visual separation

tabbycat/adjfeedback/templates/feedback_overview.html

@@ -68,7 +68,7 @@
 {% block js %}
 
   <script>
-    var setBreakingURL = '{% tournamenturl 'adjfeedback-set-adj-breaking-status' %}';
+    var setBreakingURL = '{% tournamenturl "adjfeedback-set-adj-breaking-status" %}';
   </script>
   {{ block.super }}
   <script>

tabbycat/api/views.py

@@ -331,7 +331,7 @@ def get_serializer_context(self):
     @extend_schema(summary="Generate break")
     def create(self, request, *args, **kwargs):
         self.generate_break((self.break_category,))
-        self.log_action(type=ActionLogEntry.ActionType.BREAK_GENERATE_ONE)
+        self.log_action(type=ActionLogEntry.ActionType.BREAK_GENERATE_ONE, agent=ActionLogEntry.Agent.API)
         return self.list(request, *args, **kwargs)
 
     @extend_schema(summary="Delete break")
@@ -340,7 +340,7 @@ def destroy(self, request, *args, **kwargs):
         Destroy is normally for a specific instance, now QuerySet.
         """
         self.filter_queryset(self.get_queryset()).delete()
-        self.log_action(type=ActionLogEntry.ActionType.BREAK_DELETE)
+        self.log_action(type=ActionLogEntry.ActionType.BREAK_DELETE, agent=ActionLogEntry.Agent.API)
         return Response(status=204)  # No content
 
     @extend_schema(summary="Update remark and regenerate break")
@@ -1038,7 +1038,7 @@ def get_queryset(self):
     @extend_schema(summary="Delete all pairings in the round")
     def delete_all(self, request, *args, **kwargs):
         self.get_queryset().delete()
-        self.log_action(ActionLogEntry.ActionType.DRAW_REGENERATE)
+        self.log_action(type=ActionLogEntry.ActionType.DRAW_REGENERATE, agent=ActionLogEntry.Agent.API)
         return Response(status=204)  # No content
 
 
@@ -1158,7 +1158,7 @@ def destroy(self, request, *args, **kwargs):
         instance = self.get_object()
         instance.discarded = True
         instance.save()
-        self.log_action(ActionLogEntry.ActionType.BALLOT_DISCARD)
+        self.log_action(type=ActionLogEntry.ActionType.BALLOT_DISCARD, agent=ActionLogEntry.Agent.API)
         return self.retrieve(request, *args, **kwargs)
 
 
@@ -1364,7 +1364,7 @@ def patch(self, request, *args, **kwargs):
 
             RoundAvailability.objects.bulk_create(
                 [RoundAvailability(content_type=contenttype, round=self.round, object_id=id) for id in ids - existing])
-        self.log_action(type=self.action_log_type_updated)
+        self.log_action(type=self.action_log_type_updated, agent=ActionLogEntry.Agent.API)
 
         return self.get(request, *args, **kwargs)
 
@@ -1375,7 +1375,7 @@ def put(self, request, *args, **kwargs):
             contenttype = ContentType.objects.get_for_model(model)
             RoundAvailability.objects.bulk_create(
                 [RoundAvailability(content_type=contenttype, round=self.round, object_id=p.id) for p in participants])
-        self.log_action(type=self.action_log_type_updated)
+        self.log_action(type=self.action_log_type_updated, agent=ActionLogEntry.Agent.API)
         return self.get(request, *args, **kwargs)
 
     @extend_schema(summary="Mark objects as unavailable")
@@ -1387,13 +1387,13 @@ def post(self, request, *args, **kwargs):
                 content_type=contenttype, round=self.round,
                 object_id__in=[p.id for p in participants],
             ).delete()
-        self.log_action(type=self.action_log_type_updated)
+        self.log_action(type=self.action_log_type_updated, agent=ActionLogEntry.Agent.API)
         return self.get(request, *args, **kwargs)
 
     @extend_schema(summary="Delete class of availabilities", parameters=extra_params)
     def delete(self, request, *args, **kwargs):
         self.get_queryset().delete()
-        self.log_action(type=self.action_log_type_updated)
+        self.log_action(type=self.action_log_type_updated, agent=ActionLogEntry.Agent.API)
         return Response(status=204)
 
 
@@ -1426,7 +1426,7 @@ def get_queryset(self):
     @extend_schema(summary="Delete all preformed panels from round")
     def delete_all(self, request, *args, **kwargs):
         self.get_queryset().delete()
-        self.log_action(ActionLogEntry.ActionType.PREFORMED_PANELS_DELETE)
+        self.log_action(type=ActionLogEntry.ActionType.PREFORMED_PANELS_DELETE, agent=ActionLogEntry.Agent.API)
         return Response(status=204)  # No content
 
     @extend_schema(summary="Add blank preformed panels")
@@ -1438,7 +1438,7 @@ def add_blank(self, request, *args, **kwargs):
                 'bracket_min': bracket_min,
                 'liveness': liveness,
             })
-        self.log_action(self.action_log_type_created)
+        self.log_action(type=self.action_log_type_created, agent=ActionLogEntry.Agent.API)
 
         return self.get(request, *args, **kwargs)
 

tabbycat/availability/templates/availability_index.html

@@ -40,52 +40,55 @@
       {% trans "View Draw" %} <i data-feather="chevron-right"></i>
     </a>
   {% else %}
-    {% if previous_unconfirmed %}
-      <button class="btn btn-warning" id="createDraw"
-        data-toggle="tooltip" title="{% blocktrans trimmed with round=round.prev.name %}{{ previous_unconfirmed }} debates from
-        {{ round }} do not have a completed ballot — this may lead to a draw that fails or is incorrect{% endblocktrans %}">
-        {% trans "Generate Draw" %} <i data-feather="chevron-right"></i>
-      </button>
-    {% elif availability_info.teams.in_now == 0 %}
-      <button class="btn btn-danger disabled"
-        data-toggle="tooltip" title="{% trans "The draw cannot be generated until some teams have been marked as available." %}">
-        {% trans "Generate Draw" %} <i data-feather="chevron-right"></i>
-      </button>
-    {% elif availability_info.adjs.in_now == 0 %}
-      <button class="btn btn-danger disabled"
-        data-toggle="tooltip" title="{% trans "The draw cannot be generated until some adjudicators have been marked as available." %}">
-        {% trans "Generate Draw" %} <i data-feather="chevron-right"></i>
-      </button>
-    {% elif availability_info.venues.in_now == 0 %}
-      <button class="btn btn-danger disabled"
-        data-toggle="tooltip" title="{% trans "The draw cannot be generated until some rooms have been marked as available." %}">
-        {% trans "Generate Draw" %} <i data-feather="chevron-right"></i>
-      </button>
-    {% elif min_venues > availability_info.venues.in_now %}
-      <button class="btn btn-warning" id="createDraw"
-        data-toggle="tooltip" title="{% trans "There aren't enough rooms marked as available for the number of debates — the draw may not generate properly." %}">
-         {% trans "Generate Draw" %} <i data-feather="chevron-right"></i>
-       </button>
-    {% elif min_adjudicators > availability_info.adjs.in_now %}
-      <button class="btn btn-warning" id="createDraw"
-        data-toggle="tooltip" title="{% trans "There aren't enough adjudicators marked as available for the number of debates — the draw may not generate properly." %}">
-        {% trans "Generate Draw" %} <i data-feather="chevron-right"></i>
-      </button>
-    {% elif pref.teams_in_debate == 2 and not availability_info.teams.in_now|divisibleby:2  %}
-      <button class="btn btn-warning" id="createDraw"
-        data-toggle="tooltip" title="{% trans "There is an uneven number of teams marked as available — the draw may not generate properly." %}">
-        {% trans "Generate Draw" %} <i data-feather="chevron-right"></i>
-      </button>
-    {% elif pref.teams_in_debate == 4 and not availability_info.teams.in_now|divisibleby:4  %}
-      <button class="btn btn-warning" id="createDraw"
-        data-toggle="tooltip" title="{% trans "The number of teams marked as available is not a multiple of 4 — the draw may not generate properly." %}">
-        {% trans "Generate Draw" %} <i data-feather="chevron-right"></i>
-      </button>
-    {% else %}
-      <button class="btn btn-success" id="createDraw">
-        {% trans "Generate Draw" %} <i data-feather="chevron-right"></i>
-      </button>
-    {% endif %}
+    <form id="createForm" action="{% roundurl 'draw-create' %}" method="POST">
+      {% csrf_token %}
+      {% if previous_unconfirmed %}
+        <button class="btn btn-warning" id="createDraw"
+          data-toggle="tooltip" title="{% blocktrans trimmed with round=round.prev.name %}{{ previous_unconfirmed }} debates from
+          {{ round }} do not have a completed ballot — this may lead to a draw that fails or is incorrect{% endblocktrans %}">
+          {% trans "Generate Draw" %} <i data-feather="chevron-right"></i>
+        </button>
+      {% elif availability_info.teams.in_now == 0 %}
+        <button class="btn btn-danger disabled"
+          data-toggle="tooltip" title="{% trans "The draw cannot be generated until some teams have been marked as available." %}">
+          {% trans "Generate Draw" %} <i data-feather="chevron-right"></i>
+        </button>
+      {% elif availability_info.adjs.in_now == 0 %}
+        <button class="btn btn-danger disabled"
+          data-toggle="tooltip" title="{% trans "The draw cannot be generated until some adjudicators have been marked as available." %}">
+          {% trans "Generate Draw" %} <i data-feather="chevron-right"></i>
+        </button>
+      {% elif availability_info.venues.in_now == 0 %}
+        <button class="btn btn-danger disabled"
+          data-toggle="tooltip" title="{% trans "The draw cannot be generated until some rooms have been marked as available." %}">
+          {% trans "Generate Draw" %} <i data-feather="chevron-right"></i>
+        </button>
+      {% elif min_venues > availability_info.venues.in_now %}
+        <button class="btn btn-warning" id="createDraw"
+          data-toggle="tooltip" title="{% trans "There aren't enough rooms marked as available for the number of debates — the draw may not generate properly." %}">
+          {% trans "Generate Draw" %} <i data-feather="chevron-right"></i>
+        </button>
+      {% elif min_adjudicators > availability_info.adjs.in_now %}
+        <button class="btn btn-warning" id="createDraw"
+          data-toggle="tooltip" title="{% trans "There aren't enough adjudicators marked as available for the number of debates — the draw may not generate properly." %}">
+          {% trans "Generate Draw" %} <i data-feather="chevron-right"></i>
+        </button>
+      {% elif pref.teams_in_debate == 2 and not availability_info.teams.in_now|divisibleby:2  %}
+        <button class="btn btn-warning" id="createDraw"
+          data-toggle="tooltip" title="{% trans "There is an uneven number of teams marked as available — the draw may not generate properly." %}">
+          {% trans "Generate Draw" %} <i data-feather="chevron-right"></i>
+        </button>
+      {% elif pref.teams_in_debate == 4 and not availability_info.teams.in_now|divisibleby:4  %}
+        <button class="btn btn-warning" id="createDraw"
+          data-toggle="tooltip" title="{% trans "The number of teams marked as available is not a multiple of 4 — the draw may not generate properly." %}">
+          {% trans "Generate Draw" %} <i data-feather="chevron-right"></i>
+        </button>
+      {% else %}
+        <button class="btn btn-success" id="createDraw">
+          {% trans "Generate Draw" %} <i data-feather="chevron-right"></i>
+        </button>
+      {% endif %}
+    </form>
   {% endif %}
 
 {% endblock %}
@@ -225,21 +228,4 @@
     {% endfor %}
   </div>
 
-  <form id="createForm" action="{% roundurl 'draw-create' %}" method="POST">
-    {% csrf_token %}
-  </form>
-
 {% endblock content %}
-
-{% block js %}
-  {{ block.super }}
-  <script>
-    $(document).ready( function() {
-      $("#createDraw").click(function(event) {
-        $.fn.loadButton(event.target); // Prevent double submission
-        $("#createForm").submit();
-        return false;
-      });
-    });
-  </script>
-{% endblock js %}

tabbycat/checkins/templates/checkin_ids.html

@@ -37,7 +37,7 @@ <h5 class="card-title mb-0">{{ check_info.title }}</h5>
               {% else %}
                 {% trans "Generate all identifiers" as text %}
               {% endif %}
-              <div class="list-item-group">
+              <div class="list-group-item">
                 <form action="{% tournamenturl 'admin-checkin-generate' kind=check_key %}" method="POST">
                   {% csrf_token %}
                   <button type="submit" class="btn btn-primary btn-block">{{ text }}</button>

tabbycat/draw/generator/powerpair.py

@@ -358,6 +358,11 @@ def room_rank_ordering(self, p):
 
 class AustralsPairingMixin:
 
+    def resolve_odd_brackets(self, brackets):
+        if self.options['odd_bracket'] in ('pullup_lowest_ds_rank', 'pullup_lowest_ds_rank_npulls'):
+            raise DrawUserError(_("Draw strength pullups require 'Minimum cost matching (including pullups)' as the conflict avoidance method"))
+        return super().resolve_odd_brackets(brackets)
+
     def generate_pairings(self, brackets):
         """Returns a function taking an OrderedDict as returned by
         resolve_odd_brackets(), and returning a list of Debates."""
@@ -571,7 +576,7 @@ def _pullup_random(team, size=None):
 
     @staticmethod
     def _pullup_lowest_ds_rank(team, size=None):
-        return -team.draw_strength_rank
+        return -getattr(team, 'draw_strength_rank', 0)
 
     @staticmethod
     def _pullup_lowest_ds_rank_npulls(team, size=None):