From 493eb8ce1009355675e36ef0aa9962f6daf9898f Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Wed, 24 Jun 2020 11:34:32 +0100
Subject: [PATCH] Bug 25807: Add Template 3.008 to the exclude list

This patch adds version 3.008 of Template to the excludes list in our
cpanfile. It also adds support for displaying this version on the about
page.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit eb8d23f47d5fd204b48749ac03faca8244e84264)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 about.pl                                         | 3 ++-
 cpanfile                                         | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/about.pl b/about.pl
index 62a94d87f4..066db24e44 100755
--- a/about.pl
+++ b/about.pl
@@ -566,7 +566,8 @@ foreach my $pm_type(@pm_types) {
                 current => ($pm_type eq 'current_pm' ? 1 : 0),
                 require => $stats->{'required'},
                 reqversion => $stats->{'min_ver'},
-                maxversion => $stats->{'max_ver'}
+                maxversion => $stats->{'max_ver'},
+                excversion => $stats->{'exc_ver'}
             }
         );
     }
diff --git a/cpanfile b/cpanfile
index 6b4a34ed6f..7d4cbdade1 100644
--- a/cpanfile
+++ b/cpanfile
@@ -95,7 +95,7 @@ requires 'Sereal::Decoder', '3.0';
 requires 'Sereal::Encoder', '3.0';
 requires 'Storable', '2.20';
 requires 'String::Random', '0.22';
-requires 'Template', '2.22';
+requires 'Template', '>= 2.22, != 3.008';
 requires 'Template::Plugin::HtmlToText', '0.03';
 requires 'Template::Plugin::JSON::Escape', '0.02';
 requires 'Term::ANSIColor', '1.1';
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index 63e8de55e4..7448d4094c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -168,7 +168,7 @@
                     [% END %]
                     [% END %]
                     [% IF ( ro.name ) %]
-                    [% ro.name | html %] <span style="font-weight:normal; font-size:smaller"> ([% ro.reqversion | html %][% IF ro.maxversion %] - [% ro.maxversion | html %][% END %])</span>
+                    [% ro.name | html %] <span style="font-weight:normal; font-size:smaller"> ([% ro.reqversion | html %][% IF ro.maxversion %] - [% ro.maxversion | html %][% END %][% IF ro.excversion %][% FOR v IN ro.excversion %], ![% v | html %][% END %][% END %])</span>
                     [% END %]
                     </th>
                     [% IF ( ro.name == '' ) %]
-- 
2.39.5