Attachment 63126 Details for Bug 18276 – Bug 18276: FIX status display for course reserves

[patch] Bug 18276: FIX status display for course reserves

Bug-18276-FIX-status-display-for-course-reserves.patch (text/plain), 3.80 KB, created by Jonathan Druart on 2017-05-04 15:09:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2017-05-04 15:09:44 UTC

Size: 3.80 KB

patch

obsolete

>From af41f0734f11d1acbce67d60bc65d8c791946cdd Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Thu, 20 Apr 2017 12:49:51 -0300
>Subject: [PATCH] Bug 18276: FIX status display for course reserves
>
>This include file is terribly wrong, it's called from different places
>that do not set the same flag.
>The status from detail and result page might be different from the one
>display on the course reserve table.
>---
> .../opac-tmpl/bootstrap/en/includes/item-status.inc | 19 ++++++++++++-------
> 1 file changed, 12 insertions(+), 7 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc
>index 843fcf6..81d3658 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc
>@@ -18,7 +18,10 @@ not use an API to fetch items that populates item.datedue.
> [% END %]
> [% END %]
> 
>-[% IF ( item.datedue || issue.date_due ) %]
>+[% IF item.isa('Koha::Item') %][% SET datedue = issue.date_due %]
>+[% ELSE %][% SET datedue = item.datedue || issue.date_due %]
>+[% END %]
>+[% IF datedue %]
> [% SET itemavailable = 0 %]
> [% IF item.onsite_checkout %]
> [% IF ( OPACShowCheckoutName ) %]
>@@ -35,13 +38,13 @@ not use an API to fetch items that populates item.datedue.
> [% END %]
> [% END %]
> 
>-[% IF ( item.transfertwhen ) %]
>+[% IF NOT ( item.isa('Koha::Item') ) AND item.transfertwhen %] [%# transfertwhen is set in C4::Search, do not have it for course reserves %]
> [% SET itemavailable = 0 %]
> In transit from [% Branches.GetName( item.transfertfrom ) %]
> to [% Branches.GetName( item.transfertto ) %] since [% item.transfertwhen | $KohaDates %]
> [% END %]
> 
>-[% IF ( item.waiting ) %]
>+[% IF NOT( item.isa('Koha::Item') ) AND item.waiting %] [%# Not sure where does come from this waiting flag %]
> [% SET itemavailable = 0 %]
> On hold
> [% END %]
>@@ -51,14 +54,15 @@ not use an API to fetch items that populates item.datedue.
> Item withdrawn
> [% END %]
> 
>-[% IF ( item.itemnotforloan ) %]
>+
>+[% IF NOT ( item.isa('Koha::Item') ) AND item.itemnotforloan %]
> [% SET itemavailable = 0 %]
> [% IF ( item.notforloanvalueopac ) %]
> [% item.notforloanvalueopac %] [% IF ( item.restrictedopac ) %]([% item.restrictedopac %])[% END %]
> [% ELSE %]
> Not for loan [% IF ( item.restrictedopac ) %]([% item.restrictedopac %])[% END %]
> [% END %]
>-[% ELSIF ( item.notforloan_per_itemtype ) %]
>+[% ELSIF NOT ( item.isa('Koha::Item') ) AND item.notforloan_per_itemtype %]
> [% SET itemavailable = 0 %]
> Not for loan [% IF ( item.restrictedopac ) %]([% item.restrictedopac %])[% END %]
> [% END %]
>@@ -73,11 +77,12 @@ not use an API to fetch items that populates item.datedue.
> [% END %]
> [% END %]
> 
>-[% IF item.on_order %]
>+[% IF NOT ( item.isa('Koha::Item') ) AND item.on_order %][%# on_order is only set from opac-detail.pl %]
> [% SET itemavailable = 0 %]
> On order
> [% END %]
> 
> [% IF ( itemavailable ) %]
>- Available [% IF ( item.restrictedopac ) %]([% item.restrictedopac %])[% END %]
>+ [% IF NOT item.isa('Koha::Item') %][% SET restrictedopac = item.restrictedopac %][% END %]
>+ Available [% IF restrictedopac %]([% restrictedopac %])[% END %]
> [% END %]
>-- 
>2.9.3

Actions: View | Diff | Splinter Review

Attachments on bug 18276: 61122 | 61123 | 61124 | 61125 | 61126 | 61177 | 61178 | 61179 | 61180 | 61181 | 62081 | 62082 | 62083 | 62084 | 62085 | 62476 | 62477 | 62478 | 62479 | 62480 | 62481 | 63121 | 63122 | 63123 | 63124 | 63125 | 63126 | 63166 | 63294 | 63295 | 63296 | 63297 | 63298 | 63299 | 63300 | 64748 | 64809 | 64810 | 64811 | 64812 | 64813 | 64814 | 64815 | 64816 | 64817 | 64878 | 64879 | 64880 | 64881 | 64882 | 64883 | 64884 | 64885 | 64886 | 64887 | 64974 | 64975