From 31a7f47649e6b9c6e0e5751a2561d9466547999b Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Thu, 28 Nov 2019 18:23:44 +0000
Subject: [PATCH] Maintanence team template corrections

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 019eff289ba9db77096b9d38dd5e8d0428b6772a)
---
 .../prog/en/includes/about-team.inc           | 38 ++++++++++++++++---
 1 file changed, 33 insertions(+), 5 deletions(-)

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 9cc01325f9..a2f2dee170 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc
@@ -68,14 +68,28 @@
             team will be elected.</p>
 
             <li><strong>Release maintainer:</strong>
-                <ul>
                   [% FOREACH m IN t.maintainer %]
-                    [% IF m.version == ( v - 0.01 ) %]
-                      <li>[% INCLUDE person p=m %]</li>
+                    [% IF m.version == ( v ) %]
+                      [% INCLUDE person p=m %]
                     [% END %]
                   [% END %]
-                </ul>
             </li>
+
+            [% IF t.maintainer_assistants %]
+              [% FOREACH m IN t.maintainer_assistants %]
+                [% IF m.version == ( v ) %]
+                <ul><li><strong>Assistant:</strong> [% INCLUDE person p=m %]</li></ul>
+                [% END %]
+              [% END %]
+            [% END %]
+
+            [% IF t.maintainer_mentors %]
+              [% FOREACH m IN t.maintainer_mentors %]
+                [% IF m.version == ( v ) %]
+                <ul><li><strong>Mentor:</strong> [% INCLUDE person p=m %]</li></ul>
+                [% END %]
+              [% END %]
+            [% END %]
         [% END %]
 
         [% IF t.qa_manager %]
@@ -173,10 +187,24 @@
             <ul>
                 [% FOREACH m IN t.maintainer %]
                 <li>[% m.version | html %] - [% INCLUDE person p=m %]</li>
+                  [% IF t.maintainer_assistants %]
+                    [% FOREACH ma IN t.maintainer_assistants %]
+                      [% IF ma.version == ( m.version ) %]
+                      <ul><li><strong>Assistant:</strong> [% INCLUDE person p=ma %]</li></ul>
+                      [% END %]
+                    [% END %]
+                  [% END %]
+
+                  [% IF t.maintainer_mentors %]
+                    [% FOREACH mm IN t.maintainer_mentors %]
+                      [% IF m.version == ( mm.version ) %]
+                      <ul><li><strong>Mentor:</strong> [% INCLUDE person p=mm %]</li></ul>
+                      [% END %]
+                    [% END %]
+                  [% END %]
                 [% END %]
             </ul>
         </li>
         [% END %]
-
     </ul>
 [%- END -%]
-- 
2.39.5