Bugzilla – Attachment 56933 Details for
Bug 17492
Show warning if patron's age is out of category limits
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Fixed forbidden patterns
Fixed-forbidden-patterns.patch (text/plain), 3.95 KB, created by
Radek Šiman (R-Bit Technology, s.r.o.)
on 2016-10-27 21:19:25 UTC
(
hide
)
Description:
Fixed forbidden patterns
Filename:
MIME Type:
Creator:
Radek Šiman (R-Bit Technology, s.r.o.)
Created:
2016-10-27 21:19:25 UTC
Size:
3.95 KB
patch
obsolete
>From 419ad4650a2a8a1374e5088556db309b6e8d29c3 Mon Sep 17 00:00:00 2001 >From: radiuscz <radek.siman@centrum.cz> >Date: Tue, 25 Oct 2016 22:04:11 +0200 >Subject: [PATCH] Fixed forbidden patterns > >https://bugs.koha-community.org/show_bug.cgi?id=17492 >--- > .../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 +++++----- > members/moremember.pl | 2 +- > 4 files changed, 15 insertions(+), 15 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> >- <span class="circ-hlt">Patron's age is incorrect for their category.</span> >- Ages allowed are [% age_low %]-[% age_high %]. >- <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=[% borrowernumber %]&step=3" class="btn btn-mini">Change category</a></li> >+ <span class="circ-hlt">Patron's age is incorrect for their category.</span> >+ Ages allowed are [% age_low %]-[% age_high %]. >+ <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=[% borrowernumber %]&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 938a37e..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 <span class="ex">[% message | html %]</span> > [% 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 193822c..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 %] > >diff --git a/members/moremember.pl b/members/moremember.pl >index 23a6df9..14021d9 100755 >--- a/members/moremember.pl >+++ b/members/moremember.pl >@@ -243,7 +243,7 @@ $template->param( age => $age ); > my $borrowercategory = Koha::Patron::Categories->find($data->{ 'categorycode' }); > my ($low,$high) = ($borrowercategory->dateofbirthrequired, $borrowercategory->upperagelimit); > if (($high && ($age > $high)) or ($age < $low)) { >- $template->param( age_limitations => 1 ); >+ $template->param( age_limitations => 1 ); > $template->param( age_low => $low ); > $template->param( age_high => $high ); > } >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
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