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>

diff --git a/about.pl b/about.pl
index 62a94d8..066db24 100755 (executable)
--- 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 6b4a34e..7d4cbda 100644 (file)
--- 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 63e8de5..7448d40 100644 (file)
--- 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 == '' ) %]