Attachment 87337 Details for Bug 18450 – Bug 18450: Only allow Override for renewals according to relevant sysprefs

[patch] Bug 18450: Only allow Override for renewals according to relevant sysprefs

Bug-18450-Only-allow-Override-for-renewals-accordi.patch (text/plain), 4.95 KB, created by Hayley Pelham on 2019-04-02 22:23:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hayley Pelham

Created: 2019-04-02 22:23:03 UTC

Size: 4.95 KB

patch

obsolete

>From 5c7ac06ac6d67b70bba4f2fbcc6ee2dde2d35ca6 Mon Sep 17 00:00:00 2001
>From: Hayley Mapley <hayleymapley@catalyst.net.nz>
>Date: Wed, 3 Apr 2019 10:51:38 +1300
>Subject: [PATCH] Bug 18450: Only allow Override for renewals according to
> relevant sysprefs
>
>This patch adds a conditional which refers to the system preferences
>AllowRenewalIfOtherItemsAvailable and AllowRenewalLimitOverride to
>control the display of the 'Override and renew' button, in addition to
>the 'Continue without renewing', when renewing an item that has been
>placed on hold.
>
>Test plan:
>
>--NOTE-- The following renewals must be completedd in Circulation->Renew
>
>1) Apply the patch, and ensure the following steps work as described
>
>2) In More->Administration->Global system preferences ensure that both
>the AllowRenewalLimitOverride and AllowRenewalIfOtherItemsAvailable
>preferences are both set to 'Don't allow'
>
>3) Item levelOnly one available item:
>Try to renew an item (with item level hold on it) which belongs to a
>biblio with only one item. Note the only button in the yellow alert
>box displayed is 'Continue without renewing'
>
>4) Record level/Only one available item:
>Try to renew an item (this time with a 'Next Available' hold on the
>record) which belongs to a biblio with only one item. Note the only
>button in the yellow alert box displayed is 'Continue without
>renewing'
>
>5) Item level/Multiple available items:
>Try to renew an item (with item level hold on it) which belongs to a
>biblio with multiple available items of it in the catalogue. Note
>only the 'Continue without renewing' button is displayed
>
>6) Record level/Multiple available items:
>Try to renew an item (with item level hold on it) which belongs to a
>biblio with multiple available items of it in the catalogue. Note
>only the 'Continue without renewing' button is displayed
>
>7) Set both AllowRenewalLimitOverride and
>AllowRenewalIfOtherItemsAvailable system preferences to 'Allow'
>
>8) Repeat step 3, and note only the 'Continue without renewing' button
>is displayed in the yellow alert box
>
>9) Repeat step 4, and note the only button in the yellow alert box
>displayed is 'Continue without renewing'
>
>10) Repeat step 5, not only the 'Continue without renewing' button is
>displayed (because the hold is for that specific item)
>
>11) Repeat step 6, note the item is immediately renewed and the yellow
>alert box is not displayed
>
>12) Set the AllowRenewalIfOtherItemsAvailable to 'Don't Allow' and
>repeat steps 3-6, and note that only the 'Continue without renewing'
>button is displayed
>
>13) Set the AllowRenewalIfOtherItemsAvailable system preference back to
>'Allow' and AllowRenewalLimitOverride syspref to 'Don't Allow', and
>repeat steps 3-5 and note only the 'Continue without renewal' button is
>displayed.
>
>14) Repeat step 6 and note that the item is immediately renewed with no
>yellow warning box.
>
>Sponsored-by: Catalyst IT
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt | 19 +++++++++++++------
> 1 file changed, 13 insertions(+), 6 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
>index c0542dbd0f..b1058ba8f3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
>@@ -114,12 +114,19 @@
> 
>                                 <p>This item is on hold for another patron.</p>
> 
>-                                <form method="post" action="/cgi-bin/koha/circ/renew.pl">
>-                                    <input type="hidden" name="barcode" value="[% item.barcode | html %]"/>
>-                                    <input type="hidden" name="override_limit" value="1" />
>-                                    <input type="hidden" name="override_holds" value="1" />
>-                                    <button type="submit" class="approve"><i class="fa fa-check"></i> Override and renew</button>
>-                                </form>
>+                                [% IF ((!Koha.Preference('AllowRenewalLimitOverride')) &&
>+                                ((Koha.Preference('AllowRenewalIfOtherItemsAvailable'))) && can_renew == 1) ||
>+                                ((Koha.Preference('AllowRenewalLimitOverride')) &&
>+                                ((Koha.Preference('AllowRenewalIfOtherItemsAvailable'))) && can_renew == 1 ) %]
>+
>+                                    <form method="post" action="/cgi-bin/koha/circ/renew.pl">
>+                                        <input type="hidden" name="barcode" value="[% item.barcode | html %]"/>
>+                                        <input type="hidden" name="override_limit" value="1" />
>+                                        <input type="hidden" name="override_holds" value="1" />
>+                                        <button type="submit" class="approve"><i class="fa fa-check"></i> Override and renew</button>
>+                                    </form>
>+
>+                                [% END %]
> 
>                             [% ELSIF error == "patron_restricted" %]
> 
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 18450: 62339 | 62447 | 62811 | 63226 | 63292 | 63293 | 63377 | 63764 | 64402 | 69475 | 69476 | 69489 | 72835 | 72836 | 86587 | 86588 | 86589 | 86590 | 86591 | 87337 | 87338 | 87528 | 87529