From ebd18bb7645ed29248e27a3fc67df348008e3120 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Fri, 27 Nov 2020 14:08:24 +0000
Subject: [PATCH] Bug 27108: Add 21.05 release team to teams.yaml

This patch update the docs/teams.yaml file to add the elected 21.05
release team and update the include to reflect the minor change of
structure.

Test plan.
1/ Apply the patch
2/ Update Koha.pm to state 20.11.00.000
3/ Update preferences to Version to 20.1100000
4/ Navigate to the about page
5/ Note that the 20.11 team is shown on the left and the new 21.05 team
is shown on the right.
6/ Pay particular attention to the 'Packaging manager' on the left and
'Packaging team' on the right. (We have not had a team of packaging
people before, so the template had to be updated to allow for an array
of packaging people).
7/ Signoff.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Bug 27108: (QA follow-up) Fix Agustin and Documentation manager

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit adf0293c7bc6b46dbd9c10e86a4684c602b23e16)
---
 docs/teams.yaml                               | 59 +++++++++++++++++++
 .../prog/en/includes/about-team.inc           | 16 ++++-
 2 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/docs/teams.yaml b/docs/teams.yaml
index 44c343a360..4f6e8047b5 100644
--- a/docs/teams.yaml
+++ b/docs/teams.yaml
@@ -854,3 +854,62 @@ team:
         name: Hayley Mapley
       - version: 19.05
         name: Martin Renvoize
+  21.05:
+    release_date: 1621641600
+    manager:
+      name: Jonathan Druart
+    manager_assistants:
+      - name: Martin Renvoize
+      - name: Tomás Cohen Arazi
+    qa_manager:
+      name: Katrin Fischer
+    qa:
+      - name: David Cook
+      - name: Agustín Moyano
+      - name: Martin Renvoize
+      - name: Marcel de Rooy
+      - name: Joonas Kylmälä
+      - name: Julian Maurice
+      - name: Tomás Cohen Arazi
+      - name: Josef Moravec
+      - name: Nick Clemens
+      - name: Kyle Hall
+      - name: Victor Grousset
+    te:
+      - area: UI Design
+        name: Owen Leonard
+      - area: REST API
+        name: Tomás Cohen Arazi
+      - area: Zebra
+        name: Fridolin Somers
+      - area: Accounts
+        name: Martin Renvoize
+    bugwrangler:
+      - name: Amit Gupta
+      - name: Mengü Yazıcıoğlu
+      - name: Indranil Das Gupta
+    documentation:
+      name: Caroline Cyr La Rose
+    documentation_team:
+      - name: Marie-Luce Laflamme
+      - name: Lucy Vaux-Harvey
+      - name: Henry Bolshaw
+      - name: David Nind
+    translations:
+      - name: Indranil Das Gupta
+      - name: Bernardo González Kriegel
+    packaging:
+      - name: David Cook
+      - name: Mason James
+      - name: Agustín Moyano
+    ci:
+      - name: Tomás Cohen Arazi
+      - name: Jonathan Druart
+      - name: Mason James
+    maintainer:
+      - version: 20.11
+        name: Fridolin Somers
+      - version: 20.05
+        name: Andrew Fuerste-Henry
+      - version: 19.11
+        name: Victor Grousset
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc
index a7ef74033e..bcd6edafc1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc
@@ -154,9 +154,19 @@
         [% END %]
 
         [% IF t.packaging %]
-        <li><strong>Packaging manager:</strong>
-            [% INCLUDE person p=t.packaging %]
-        </li>
+            [% IF t.packaging.size / 2 == 1 %]
+            <li><strong>Packaging manager:</strong>
+                [% INCLUDE person p=t.packaging %]
+            </li>
+            [% ELSE %]
+            <li><strong>Packaging team:</strong>
+                <ul>
+                    [% FOREACH pa IN t.packaging %]
+                    <li>[% INCLUDE person p = pa %]</li>
+                    [% END %]
+                </ul>
+            </li>
+            [% END %]
         [% END %]
 
         [% IF t.ci %]
-- 
2.39.5