Attachment 56989 Details for Bug 17492 – Bug 17492: Fixed forbidden patterns

[patch] Bug 17492: Fixed forbidden patterns

Bug-17492-Fixed-forbidden-patterns.patch (text/plain), 3.35 KB, created by Radek Šiman (R-Bit Technology, s.r.o.) on 2016-10-31 10:19:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Radek Šiman (R-Bit Technology, s.r.o.)

Created: 2016-10-31 10:19:06 UTC

Size: 3.35 KB

patch

obsolete

>From 24409e265e94115e49244ac1b3ac9bd6d2327151 Mon Sep 17 00:00:00 2001
>From: radiuscz <radek.siman@centrum.cz>
>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 <veron@veron.ch>
>---
> .../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 %]
> <li>
>-	Patron's age is incorrect for their category.
>-	Ages allowed are [% age_low %]-[% age_high %].
>-	<a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=3" class="btn btn-mini">Change category</a></li>
>+ Patron's age is incorrect for their category.
>+ Ages allowed are [% age_low %]-[% age_high %].
>+ <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=3" class="btn btn-mini">Change category</a></li>
> [% 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 %]
> <ul class="circmessage">
>-	[% IF fines %]
>-	 [% INCLUDE 'blocked-fines.inc' %]
>+ [% IF fines %]
>+ [% INCLUDE 'blocked-fines.inc' %]
>+ [% END %]
>+ [% IF age_limitations %]
>+ [% INCLUDE 'category-out-of-age-limit.inc' %]
> [% END %]
>-	[% IF age_limitations %]
>-	 [% INCLUDE 'category-out-of-age-limit.inc' %]
>-	[% END %]
> </ul>
> [% END %]
> 
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 17492: 56805 | 56806 | 56874 | 56933 | 56934 | 56935 | 56936 | 56937 | 56976 | 56985 | 56986 | 56987 | 56988 | 56989 | 56990 | 56995 | 62860 | 67040 | 67041 | 67042 | 67850 | 67851 | 67867 | 67868 | 68139 | 68140 | 68141 | 68142 | 68143 | 68144 | 68145 | 91028 | 91029 | 91044 | 91045 | 91098 | 91099 | 91100