From 83a3b06bb1eb0625c99d982f39730d19598237e6 Mon Sep 17 00:00:00 2001 From: Martin Renvoize <martin.renvoize@ptfs-europe.com> Date: Sun, 8 Mar 2020 08:39:40 +0000 Subject: [PATCH] Bug 24402: About template corrections With the 20.05 team we introduced and expanded some roles. This patch adds support for: * removal of the release maintainer for development releases * a list of documentation managers * a list of packaging manager Signed-off-by: Michal Denar <black23@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> --- .../intranet-tmpl/prog/en/includes/about-team.inc | 32 ++++++++++++++++++---- 1 file changed, 26 insertions(+), 6 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 d32bfcad61..cc43e519c1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc @@ -69,13 +69,13 @@ currently installed Koha version. They will be in these roles up until <strong>[% t.release_date | $KohaDates %]</strong>, when the next team will be elected.</p> - <li><strong>Release maintainer:</strong> - [% FOREACH m IN t.maintainer %] - [% IF m.version == ( v ) %] + [% FOREACH m IN t.maintainer %] + [% IF m.version == ( v ) %] + <li><strong>Release maintainer:</strong> [% INCLUDE person p=m %] - [% END %] - [% END %] - </li> + </li> + [% END %] + [% END %] [% IF t.maintainer_assistants %] [% FOREACH m IN t.maintainer_assistants %] @@ -111,9 +111,19 @@ [% END %] [% IF t.documentation %] + [%- IF t.documentation.list.size == 1 %] <li><strong>Documentation manager:</strong> [% INCLUDE person p=t.documentation %] </li> + [% ELSE %] + <li><strong>Documentation managers:</strong> + <ul> + [% FOREACH doc_manager IN t.documentation %] + <li>[% INCLUDE person p=doc_manager %]</li> + [% END %] + </ul> + </li> + [% END %] [% END %] [% IF t.documentation_team %] @@ -133,9 +143,19 @@ [% END %] [% IF t.packaging %] + [%- IF t.packaging.list.size == 1 %] <li><strong>Packaging manager:</strong> [% INCLUDE person p=t.packaging %] </li> + [% ELSE %] + <li><strong>Packaging managers:</strong> + <ul> + [% FOREACH packaging_manager IN t.packaging %] + <li>[% INCLUDE person p=packaging_manager %]</li> + [% END %] + </ul> + </li> + [% END %] [% END %] [% IF t.ci %] -- 2.11.0