From 24409e265e94115e49244ac1b3ac9bd6d2327151 Mon Sep 17 00:00:00 2001 From: radiuscz Date: Tue, 25 Oct 2016 22:04:11 +0200 Subject: [PATCH] Bug 17492: Fixed forbidden patterns MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marc VĂ©ron --- .../prog/en/includes/category-out-of-age-limit.inc | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 12 ++++++------ .../intranet-tmpl/prog/en/modules/members/moremember.tt | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/category-out-of-age-limit.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/category-out-of-age-limit.inc index 676c436..825e8b7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/category-out-of-age-limit.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/category-out-of-age-limit.inc @@ -1,6 +1,6 @@ [% IF age_limitations %]
  • - Patron's age is incorrect for their category. - Ages allowed are [% age_low %]-[% age_high %]. - Change category
  • + Patron's age is incorrect for their category. + Ages allowed are [% age_low %]-[% age_high %]. + Change category [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 88d3c3f..ac8ede3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -791,14 +791,14 @@ No patron matched [% message | html %] [% END %] [% IF ( charges || age_limitations ) %] - [% IF charges %] - [% INCLUDE 'blocked-fines.inc' + [% IF charges %] + [% INCLUDE 'blocked-fines.inc' fines = chargesamount %] - [% END %] - [% IF age_limitations %] - [% INCLUDE 'category-out-of-age-limit.inc' %] - [% END %] + [% END %] + [% IF age_limitations %] + [% INCLUDE 'category-out-of-age-limit.inc' %] + [% END %] [% END %] [% IF ( charges_guarantees ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index 6b5e2f2..0def293 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -181,12 +181,12 @@ function validate1(date) { [% IF fines || age_limitations %] [% END %] -- 2.1.4