Bugzilla – Attachment 31203 Details for
Bug 11577
Automatic renewals
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 11577: OPAC bootstrap theme changes
PASSED-QA-Bug-11577-OPAC-bootstrap-theme-changes.patch (text/plain), 3.08 KB, created by
Martin Renvoize (ashimema)
on 2014-08-27 17:36:31 UTC
(
hide
)
Description:
[PASSED QA] Bug 11577: OPAC bootstrap theme changes
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2014-08-27 17:36:31 UTC
Size:
3.08 KB
patch
obsolete
>From b1dbf3bcca88e1ab3714a1f8722a19b92b7bd409 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Holger=20Mei=C3=9Fner?= <h.meissner.82@web.de> >Date: Thu, 15 May 2014 16:48:02 +0200 >Subject: [PATCH] [PASSED QA] Bug 11577: OPAC bootstrap theme changes >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >This patch makes opac-user.pl and the bootstrap version of opac-user.tt >handle the new renewal errors "auto_renew" and "auto_too_soon". > >To test: > >1) Set global syspref "opacthemes" to bootstrap. >2) Set global syspref "OpacRenewalAllowed" to Allow. >3) Test the same things as in previous patch, this time for the OPAC > summary page. > >Sponsored-by: Hochschule für Gesundheit (hsg), Germany >Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 3 +++ > opac/opac-user.pl | 6 ++++-- > 2 files changed, 7 insertions(+), 2 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >index 16783a7..3c4754a 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >@@ -230,6 +230,9 @@ > <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span> > [% ELSIF ( ISSUE.too_many ) %] > Not renewable >+ [% ELSIF ( ISSUE.auto_renew || ISSUE.auto_too_soon ) %] >+ Automatic renewal >+ <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span> > [% ELSIF ( ISSUE.too_soon ) %] > No renewal before [% ISSUE.soonestrenewdate %] > <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span> >diff --git a/opac/opac-user.pl b/opac/opac-user.pl >index 61b88ae..9f88c1a 100755 >--- a/opac/opac-user.pl >+++ b/opac/opac-user.pl >@@ -194,8 +194,10 @@ if ($issues){ > $issue->{'renewed'} = $renewed{ $issue->{'itemnumber'} }; > > if ($renewerror) { >- $issue->{'too_many'} = 1 if $renewerror eq 'too_many'; >- $issue->{'on_reserve'} = 1 if $renewerror eq 'on_reserve'; >+ $issue->{'too_many'} = 1 if $renewerror eq 'too_many'; >+ $issue->{'on_reserve'} = 1 if $renewerror eq 'on_reserve'; >+ $issue->{'auto_renew'} = 1 if $renewerror eq 'auto_renew'; >+ $issue->{'auto_too_soon'} = 1 if $renewerror eq 'auto_too_soon'; > > if ( $renewerror eq 'too_soon' ) { > $issue->{'too_soon'} = 1; >-- >1.7.10.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 11577
:
28425
|
28426
|
28427
|
28428
|
28429
|
28430
|
28431
|
28432
|
28433
|
28434
|
28454
|
28595
|
28596
|
28597
|
28598
|
28599
|
28600
|
28601
|
28602
|
28603
|
28604
|
29393
|
29394
|
29395
|
29396
|
29397
|
29398
|
29399
|
29400
|
29401
|
29402
|
29966
|
29967
|
29968
|
29969
|
29970
|
29971
|
29972
|
29973
|
29974
|
29975
|
30248
|
30249
|
30250
|
30251
|
30252
|
30253
|
30254
|
30255
|
30256
|
30257
|
30258
|
30692
|
30693
|
30694
|
30695
|
30696
|
30697
|
30698
|
30699
|
30700
|
30701
|
30702
|
31076
|
31077
|
31078
|
31079
|
31080
|
31081
|
31082
|
31083
|
31084
|
31085
|
31086
|
31198
|
31199
|
31200
|
31201
|
31202
|
31203
|
31204
|
31205
|
31206
|
31207
|
31208
|
31209
|
31640
|
31641
|
31642
|
31643
|
31644
|
31645
|
31646
|
31647
|
31648
|
31649
|
31650
|
31651
|
31652
|
31653
|
31654
|
31655
|
31656
|
31657
|
31658
|
31659
|
31660
|
31661
|
31662
|
31663
|
57734