Attachment 47503 Details for Bug 15645 – Bug 15645: Remove the confusing wait var and use found instead

[patch] Bug 15645: Remove the confusing wait var and use found instead

Bug-15645-Remove-the-confusing-wait-var-and-use-fo.patch (text/plain), 3.63 KB, created by Jonathan Druart on 2016-02-01 13:13:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2016-02-01 13:13:24 UTC

Size: 3.63 KB

patch

obsolete

>From 91f9be104062811fcf6eb38bd290455e919ae2d3 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Mon, 1 Feb 2016 13:13:10 +0000
>Subject: [PATCH] Bug 15645: Remove the confusing wait var and use found
> instead
>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt | 10 +++++-----
> reserve/request.pl                                         |  1 -
> 2 files changed, 5 insertions(+), 6 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>index 5e6230a..3840bc3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>@@ -689,7 +689,7 @@ function checkMultiHold() {
>           <input type="hidden" name="borrowernumber" value="[% reserveloo.borrowernumber %]" />
>           <input type="hidden" name="biblionumber" value="[% reserveloo.biblionumber %]" />
>           <select name="rank-request">
>-              [% IF ( reserveloo.wait ) %]
>+              [% IF ( reserveloo.found ) %]
>                   [% IF ( reserveloo.intransit ) %]
>                       <option value="T" selected="selected">In transit</option>
>                   [% ELSE %]
>@@ -705,7 +705,7 @@ function checkMultiHold() {
>                           <option value="[% optionloo.num %]">[% optionloo.num %]</option>
>                       [% END %]
>                   [% END %]
>-              [% ELSIF !reserveloo.wait %]
>+              [% ELSIF !reserveloo.found %]
>                   <option value="[% reserveloo.priority %]" selected="selected">[% reserveloo.priority %]</option>
>               [% END %]
>               <option value="del">del</option>
>@@ -751,7 +751,7 @@ function checkMultiHold() {
>             [% END %]
>         </td>
>         <td>
>-    [% IF ( reserveloo.wait ) %]
>+    [% IF ( reserveloo.found ) %]
>     	[% IF ( reserveloo.atdestination ) %]
>             [% IF ( reserveloo.found ) %]
>                 Item waiting at <b> [% reserveloo.wbrname %]</b> <input type="hidden" name="pickup" value="[% reserveloo.wbrcode %]" /> since [% reserveloo.waiting_date | $KohaDates %]
>@@ -776,7 +776,7 @@ function checkMultiHold() {
>     [% END %]
>         </td>
>         <td>
>-    [% IF ( reserveloo.wait ) %]
>+    [% IF ( reserveloo.found ) %]
>           <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% reserveloo.biblionumber %]">
>                 [% IF ( reserveloo.barcodenumber ) %]
>                     [% reserveloo.barcodenumber %]
>@@ -824,7 +824,7 @@ function checkMultiHold() {
> 
>         [% IF SuspendHoldsIntranet %]
> 	<td>
>-	[% UNLESS ( reserveloo.wait ) %]
>+        [% UNLESS ( reserveloo.found ) %]
>             <input type="button" value="[% IF ( reserveloo.suspend ) %]Unsuspend[% ELSE %]Suspend[% END %]" onclick="window.location.href='request.pl?action=toggleSuspend&amp;reserve_id=[% reserveloo.reserve_id %]&amp;borrowernumber=[% reserveloo.borrowernumber %]&amp;biblionumber=[% reserveloo.biblionumber %]&amp;date=[% reserveloo.date %]&amp;suspend_until=' + $('#suspend_until_[% reserveloo.reserve_id %]').val()" />
> 
>             [% IF AutoResumeSuspendedHolds %]
>diff --git a/reserve/request.pl b/reserve/request.pl
>index 3b37cac..2883d99 100755
>--- a/reserve/request.pl
>+++ b/reserve/request.pl
>@@ -506,7 +506,6 @@ foreach my $biblionumber (@biblionumbers) {
>         }
> 
>         if ( $res->is_found() ) {
>-            $reserve{'wait'}          = 1;
>             $reserve{'holdingbranch'} = $res->item()->holdingbranch();
>             $reserve{'biblionumber'}  = $res->item()->biblionumber();
>             $reserve{'barcodenumber'} = $res->item()->barcode();
>-- 
>2.1.0

Actions: View | Diff | Splinter Review

Attachments on bug 15645: 47197 | 47488 | 47502 | 47503 | 47595