Attachment 106325 Details for Bug 25807 – Bug 25807: Add Template 3.008 to the exclude list

[patch] Bug 25807: Add Template 3.008 to the exclude list

Bug-25807-Add-Template-3008-to-the-exclude-list.patch (text/plain), 2.60 KB, created by Julian Maurice on 2020-06-26 10:10:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Maurice

Created: 2020-06-26 10:10:46 UTC

Size: 2.60 KB

patch

obsolete

>From ac3c4910116074124ec3374e2d63943641c34ea4 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>
>---
> 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.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 25807: 106241 | 106242 | 106325