From 837cf82715d1e46fd03f8d3159d9b1a5e679b06f Mon Sep 17 00:00:00 2001 From: Martin Renvoize 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 --- 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 62a94d87f4f..066db24e441 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 a2b79f29fdc..90530ef4919 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 63e8de55e41..7448d4094cc 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 %] ([% ro.reqversion | html %][% IF ro.maxversion %] - [% ro.maxversion | html %][% END %]) + [% ro.name | html %] ([% ro.reqversion | html %][% IF ro.maxversion %] - [% ro.maxversion | html %][% END %][% IF ro.excversion %][% FOR v IN ro.excversion %], ![% v | html %][% END %][% END %]) [% END %] [% IF ( ro.name == '' ) %] -- 2.27.0