Attachment 71733 Details for Bug 18789 – Bug 18789: (QA follow-up) Use patron object in batch checkout template

[patch] Bug 18789: (QA follow-up) Use patron object in batch checkout template

Bug-18789-QA-follow-up-Use-patron-object-in-batch-.patch (text/plain), 4.69 KB, created by Josef Moravec on 2018-02-16 11:13:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Moravec

Created: 2018-02-16 11:13:45 UTC

Size: 4.69 KB

patch

obsolete

>From 6e764a2d5b49fd4344f172e82ae969d699081cd5 Mon Sep 17 00:00:00 2001
>From: Josef Moravec <josef.moravec@gmail.com>
>Date: Fri, 16 Feb 2018 10:15:14 +0000
>Subject: [PATCH] Bug 18789: (QA follow-up) Use patron object in batch checkout
> template
>
>1) Enable batch checkouts in system preferences and set it on for some
>patron categories
>2) Try to batch checkout for some patron with one of these categories
>--> without patch the batch checkout page is even not shown
>--> with patch batch checking out is working as expected
>
>Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
>---
> .../en/modules/circ/circulation_batch_checkouts.tt | 24 +++++++++++-----------
> 1 file changed, 12 insertions(+), 12 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
>index 9bbdabb..4eefdbf 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
>@@ -6,7 +6,7 @@
> [% INCLUDE 'doc-head-open.inc' %]
> [% SET destination = "circ" %]
> <title>Koha &rsaquo; Circulation
>-[% IF borrowernumber and borrower %]
>+[% IF patron %]
>   &rsaquo; Batch check out &rsaquo; Issuing items to [% INCLUDE 'patron-title.inc' invert_name = 1 no_html = 1 %]
> [% END %]
> </title>
>@@ -20,7 +20,7 @@
> [% INCLUDE 'circ-search.inc' %]
> 
> <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo;
>-    [% IF borrower and borrowernumber %]
>+    [% IF patron %]
>         <a href="/cgi-bin/koha/circ/circulation.pl">Batch check out</a> &rsaquo; [% INCLUDE 'patron-title.inc' %]
>     [% ELSE %]
>         Batch check out
>@@ -34,13 +34,13 @@
> 
> <div class="yui-g">
> 
>-[% IF borrowernumber %]
>+[% IF patron %]
> [% INCLUDE 'members-toolbar.inc' %]
> [% END %]
> 
>-[% IF borrower and not batch_allowed %]
>+[% IF patron and not batch_allowed %]
>   <div class="dialog alert">You are not allowed to use batch checkout for this patron</div>
>-[% ELSIF borrower and noissues and not checkout_infos %]
>+[% ELSIF patron and noissues and not checkout_infos %]
>   <div class="dialog alert">
>     Cannot check out!
>     [% IF charges_is_blocker %]
>@@ -55,7 +55,7 @@
>         </li>
>     [% END %]
>   </div>
>-[% ELSIF borrower and not checkout_infos %]
>+[% ELSIF patron and not checkout_infos %]
>   <form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/circ/circulation.pl">
>     <fieldset id="circ_circulation_issue">
>       <label for="barcode">Checking out to [% INCLUDE 'patron-title.inc' %]</label>
>@@ -76,7 +76,7 @@
>       </fieldset>
>       <input type="hidden" name="op" value="show" />
>       <fieldset class="action">
>-        <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" />
>+        <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" />
>         <input type="hidden" name="branch" value="[% branch %]" />
>         <input type="hidden" name="batch" value="1" />
>         <input type="submit" value="Check out" class="button" />
>@@ -84,12 +84,12 @@
>     </fieldset>
>   </form>
> 
>-[% ELSIF borrower %]
>+[% ELSIF patron %]
>   [% IF confirmation_needed && CAN_user_circulate_force_checkout %]
>-    <h3>Batch checkout confirmation [% IF borrowernumber %] for [% INCLUDE 'patron-title.inc' invert_name = 1 %] [% END %]</h3>
>+    <h3>Batch checkout confirmation [% IF patron %] for [% INCLUDE 'patron-title.inc' invert_name = 1 %] [% END %]</h3>
>     <form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
>   [% ELSE %]
>-    <h3>Batch checkout information [% IF borrowernumber %] for [% INCLUDE 'patron-title.inc' invert_name = 1 %] |[% batch %]|[% END %]</h3>
>+    <h3>Batch checkout information [% IF patron.borrowernumber %] for [% INCLUDE 'patron-title.inc' invert_name = 1 %] |[% batch %]|[% END %]</h3>
>   [% END %]
>     <table id="checkout_infos">
>       <thead>
>@@ -264,7 +264,7 @@
>     [% IF confirmation_needed && CAN_user_circulate_force_checkout %]
>         <fieldset>
>             <legend>Please confirm checkout</legend>
>-      <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
>+      <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
>       <input type="hidden" name="issueconfirmed" value="1" />
>       <input type="hidden" name="debt_confirmed" value="1" />
>       <input type="hidden" name="branch" value="[% branch %]" />
>@@ -281,7 +281,7 @@
> </div>
> </div>
> </div>
>-[% IF borrower %]
>+[% IF patron %]
>     <div class="yui-b">
>         [% INCLUDE 'circ-menu.inc' %]
>     </div>
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 18789: 64211 | 64212 | 64213 | 64214 | 64215 | 64216 | 64218 | 64219 | 64221 | 64229 | 71301 | 71302 | 71303 | 71304 | 71305 | 71306 | 71307 | 71308 | 71309 | 71310 | 71311 | 71485 | 71486 | 71487 | 71488 | 71489 | 71490 | 71491 | 71492 | 71493 | 71494 | 71495 | 71496 | 71679 | 71680 | 71681 | 71682 | 71683 | 71684 | 71685 | 71686 | 71687 | 71688 | 71689 | 71690 | 71691 | 71713 | 71714 | 71715 | 71716 | 71717 | 71718 | 71719 | 71720 | 71721 | 71722 | 71723 | 71724 | 71725 | 71726 | 71727 | 71728 | 71729 | 71730 | 71731 | 71732 | 71733 | 71734 | 71735 | 71736 | 71827 | 71838 | 71841 | 73293 | 73890 | 75237