From 283c771e874af1a7d7a5a56067ead5e95cdff28f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89tienne=20Beaul=C3=A9?= <beauleetienne0@gmail.com>
Date: Sun, 6 Oct 2019 10:36:49 -0400
Subject: [PATCH 1/5] Fix AttributeError on motion sorting

In 3872da0, a check for whether there is a motion was added, but an
oversight looked for an attribute to the None. This commit sets the
sorting to 0 in the case the motion doesn't exist.

Also marked the question mark for translation.
---
 tabbycat/utils/tables.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tabbycat/utils/tables.py b/tabbycat/utils/tables.py
index 287b58e3085..eda8ee00aad 100644
--- a/tabbycat/utils/tables.py
+++ b/tabbycat/utils/tables.py
@@ -622,11 +622,11 @@ def add_motion_column(self, motions, show_order=False):
                 'tooltip': _("Order as listed"),
             }, [{
                 'text': motion.seq if motion is not None else self.BLANK_TEXT,
-                'sort': motion.round.seq + (motion.seq * 0.1) if motion is not None else motion.round.seq
+                'sort': motion.round.seq + (motion.seq * 0.1) if motion is not None else 0
             } for motion in motions])
 
         motion_data = [{
-            'text': motion.reference if motion.reference else '?',
+            'text': motion.reference if motion.reference else _('?'),
             'popover': {'content' : [{'text': motion.text}]}
         } if motion else self.BLANK_TEXT for motion in motions]
         self.add_column({'key': "motion", 'title': _("Motion")}, motion_data)

From 0d02a23e4863a814d69de3d7ca831cf8240487ef Mon Sep 17 00:00:00 2001
From: Philip Belesky <contact@philipbelesky.com>
Date: Sat, 19 Oct 2019 12:55:02 +1100
Subject: [PATCH 2/5] Touch up to 070a0e

---
 tabbycat/results/result.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tabbycat/results/result.py b/tabbycat/results/result.py
index dfd7ae8750a..04a7a6169e7 100644
--- a/tabbycat/results/result.py
+++ b/tabbycat/results/result.py
@@ -537,7 +537,6 @@ def get_score(self, adjudicator, side, position):
             return None
 
     def set_score(self, adjudicator, side, position, score):
-        scoresheet = self.scoresheets[adjudicator]
         try:
             scoresheet = self.scoresheets[adjudicator]
         except KeyError:

From 7cd4c19f8dca18805b52029f0e6a0126990f5e65 Mon Sep 17 00:00:00 2001
From: Philip Belesky <contact@philipbelesky.com>
Date: Sat, 19 Oct 2019 13:04:57 +1100
Subject: [PATCH 3/5] Suppress unavailability highlights in drag/drop UIs for
 #1279

---
 tabbycat/draw/templates/DraggableTeam.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tabbycat/draw/templates/DraggableTeam.vue b/tabbycat/draw/templates/DraggableTeam.vue
index 4e02c41f34d..bb2056b02c2 100644
--- a/tabbycat/draw/templates/DraggableTeam.vue
+++ b/tabbycat/draw/templates/DraggableTeam.vue
@@ -1,5 +1,5 @@
 <template>
-  <draggable-item :drag-payload="dragPayload" :class="{ 'bg-dark text-white': !item.available }"
+  <draggable-item :drag-payload="dragPayload" :class="{ 'bg-dark text-white': isUnavailable }"
                   :enable-hover="true" :hover-item="hoverableData" :hover-type="hoverableType">
 
       <span slot="number" class="d-none"><span></span></span>
@@ -32,6 +32,12 @@ export default {
       }
       return name
     },
+    isUnavailable: function () {
+      if (this.$store.state.round.stage === 'E') {
+        return false // Team availabilities are not set in break rounds so supress the coloring
+      }
+      return !this.item.available
+    },
     highlightData: function () {
       return this.item
     },

From 8a2280bd5df7c0556f9e86a7994473802fddd8b4 Mon Sep 17 00:00:00 2001
From: Philip Belesky <contact@philipbelesky.com>
Date: Sat, 19 Oct 2019 13:32:22 +1100
Subject: [PATCH 4/5] Check for undefined; close FRONTEND-KP

---
 tabbycat/utils/templates/ConflictableMixin.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tabbycat/utils/templates/ConflictableMixin.vue b/tabbycat/utils/templates/ConflictableMixin.vue
index c263920e164..eb7477436f2 100644
--- a/tabbycat/utils/templates/ConflictableMixin.vue
+++ b/tabbycat/utils/templates/ConflictableMixin.vue
@@ -31,11 +31,13 @@ export default {
         let team = debateTeams[debateTeamPosition]
         if (team !== null) { // Handle when sides editing may be in progress
           let teamsConflicts = this.teamClashesForItem(team.id)
-          if ('institution' in teamsConflicts) {
-            for (const institutionalConflict of teamsConflicts.institution) {
-              if (institutionalConflict.id === idToFind) {
-                found = true
-                break
+          if (typeof teamsConflicts !== 'undefined') {
+            if ('institution' in teamsConflicts) {
+              for (const institutionalConflict of teamsConflicts.institution) {
+                if (institutionalConflict.id === idToFind) {
+                  found = true
+                  break
+                }
               }
             }
           }

From 070c94d09c94efc38dab719628f6d6d00f70d750 Mon Sep 17 00:00:00 2001
From: Philip Belesky <contact@philipbelesky.com>
Date: Sat, 19 Oct 2019 13:35:58 +1100
Subject: [PATCH 5/5] Bump for 2.3.2 release

---
 CHANGELOG.rst             | 9 +++++++++
 CONTRIBUTING.rst          | 2 +-
 docs/conf.py              | 2 +-
 tabbycat/settings/core.py | 4 ++--
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 9d561aab1a7..658b734677d 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,15 @@
 Change Log
 ==========
 
+
+2.3.2
+-----
+*Release date: 19 October 2019*
+
+- Fixed issue where teams would appear to be unavailable in break rounds
+- Other minor fixes
+
+
 2.3.1
 -----
 *Release date: 6 October 2019*
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 607c5298362..667c4dc3cd4 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -145,7 +145,7 @@ Release checklist
 
 1. Check that all migrations have been generated and committed into Git
 2. Bump version number in ``docs/conf.py``
-3. Bump version number and (if applicable) codename in ``tabbycat/settings.py``
+3. Bump version number and (if applicable) codename in ``tabbycat/settings/core.py``
 4. Update the main ``CHANGELOG.rst`` file (including release date)
 5. Check the major current deployment options, including:
     1. The ``deploy_heroku.py`` script
diff --git a/docs/conf.py b/docs/conf.py
index 33d5dbb2832..4098ae0a609 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -60,7 +60,7 @@
 # The short X.Y version.
 version = '2.3'
 # The full version, including alpha/beta/rc tags.
-release = '2.3.1'
+release = '2.3.2'
 
 rst_epilog = """
 .. |vrelease| replace:: v{release}
diff --git a/tabbycat/settings/core.py b/tabbycat/settings/core.py
index 80ff7918b70..a2f32913ffe 100644
--- a/tabbycat/settings/core.py
+++ b/tabbycat/settings/core.py
@@ -25,9 +25,9 @@
 # Version
 # ==============================================================================
 
-TABBYCAT_VERSION = '2.3.1'
+TABBYCAT_VERSION = '2.3.2'
 TABBYCAT_CODENAME = 'LaPerm'
-READTHEDOCS_VERSION = 'v2.3.1'
+READTHEDOCS_VERSION = 'v2.3.2'
 
 # ==============================================================================
 # Internationalization and Localization