Bugzilla – Attachment 71725 Details for
Bug 18789
Send a Koha::Patron object to the templates
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18789: Use the patron variable in circulation.[pl|tt]
Bug-18789-Use-the-patron-variable-in-circulationpl.patch (text/plain), 15.74 KB, created by
Josef Moravec
on 2018-02-16 11:13:16 UTC
(
hide
)
Description:
Bug 18789: Use the patron variable in circulation.[pl|tt]
Filename:
MIME Type:
Creator:
Josef Moravec
Created:
2018-02-16 11:13:16 UTC
Size:
15.74 KB
patch
obsolete
>From fc65b249fc0eaa184aa858c0fe81646033215878 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Thu, 15 Feb 2018 15:06:04 -0300 >Subject: [PATCH] Bug 18789: Use the patron variable in circulation.[pl|tt] > >Signed-off-by: Josef Moravec <josef.moravec@gmail.com> >--- > circ/circulation.pl | 2 - > .../prog/en/includes/patron-search.inc | 2 +- > .../prog/en/modules/circ/circulation.tt | 52 +++++++++++----------- > 3 files changed, 27 insertions(+), 29 deletions(-) > >diff --git a/circ/circulation.pl b/circ/circulation.pl >index a64844e..1b26521 100755 >--- a/circ/circulation.pl >+++ b/circ/circulation.pl >@@ -609,8 +609,6 @@ if ( $patron ) { > my $av = Koha::AuthorisedValues->search({ category => 'ROADTYPE', authorised_value => $patron->streettype }); > my $roadtype = $av->count ? $av->next->lib : ''; > $template->param( >- %{ $patron->unblessed }, >- borrower => $patron->unblessed, > roadtype => $roadtype, > patron => $patron, > categoryname => $patron->category->description, >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc >index f8c7ec9..84e67a3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc >@@ -165,5 +165,5 @@ > var CAN_user_borrowers_edit_borrowers = "[% CAN_user_borrowers_edit_borrowers %]"; > var NorwegianPatronDBEnable = "[% NorwegianPatronDBEnable %]"; > var CATCODE_MULTI = "[% CATCODE_MULTI %]"; >- var borrowernumber = "[% borrowernumber %]"; >+ var borrowernumber = "[% patron.borrowernumber %]"; > </script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >index 92489bf..6afdc19 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -10,7 +10,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > [% SET destination = "circ" %] > <title>Koha › Circulation >-[% IF borrowernumber and borrower%] >+[% IF patron %] > › Checking out to [% INCLUDE 'patron-title.inc' invert_name = 1 no_html = 1 %] > [% END %] > </title> >@@ -24,7 +24,7 @@ > [% INCLUDE 'circ-search.inc' %] > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> › >-[% IF borrowernumber and borrower %] >+[% IF patron %] > <a href="/cgi-bin/koha/circ/circulation.pl">Checkouts</a> › [% INCLUDE 'patron-title.inc' %] > [% ELSE %] > <strong>Checkouts</strong> >@@ -44,7 +44,7 @@ > <div class="yui-b"> > [% END %] > >-[% IF borrowernumber %] >+[% IF patron %] > [% INCLUDE 'members-toolbar.inc' %] > [% END %] > >@@ -226,7 +226,7 @@ > [% END %] > > <input type="hidden" name="barcode" value="[% barcode |html %]" /> >- <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="override_high_holds" value="[% override_high_holds %]"/> > [% IF ( DEBT ) %]<input type="hidden" name="debt_confirmed" value="1" />[% END %] >@@ -253,7 +253,7 @@ > [% IF ( RESERVED ) %] > <form method="get" action="/cgi-bin/koha/circ/circulation.pl"> > <input type="hidden" name="restoreduedatespec" /> >- <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" /> >+ <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" /> > <input type="hidden" name="duedatespec" value="[% duedatespec %]" /> > <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" /> > <button class="print" type="submit" onclick="Dopop('hold-transfer-slip.pl?borrowernumber=[% reserveborrowernumber %]&biblionumber=[% itembiblionumber %]&op=slip');this.form.submit();"><i class="fa fa-print"></i> Don't check out and print slip (P)</button> >@@ -263,7 +263,7 @@ > [% IF ( RESERVE_WAITING ) %] > <form method="get" action="/cgi-bin/koha/circ/circulation.pl"> > <input type="hidden" name="restoreduedatespec" /> >- <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" /> >+ <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" /> > <input type="hidden" name="duedatespec" value="[% duedatespec %]" /> > <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" /> > <button class="print" type="submit" onclick="Dopop('hold-transfer-slip.pl?borrowernumber=[% reserveborrowernumber %]&biblionumber=[% itembiblionumber %]&op=slip');this.form.submit();"><i class="fa fa-print"></i> Don't check out and print slip (P)</button> >@@ -272,7 +272,7 @@ > > <form method="get" action="/cgi-bin/koha/circ/circulation.pl"> > [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %] >- <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" /> >+ <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" /> > <input type="hidden" name="duedatespec" value="[% duedatespec %]" /> > <input type="hidden" name="restoreduedatespec" /> > <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" /> >@@ -289,7 +289,7 @@ > > [% IF ( RESERVED || ISSUED_TO_ANOTHER ) && (CAN_user_reserveforothers_place_holds ) %] > [% UNLESS noissues %] >- <button type="submit" onclick="window.location.href='/cgi-bin/koha/reserve/request.pl?biblionumber=[% itembiblionumber %]&borrowernumber=[% borrowernumber %]'"><i class="fa fa-sticky-note-o"></i> Cancel checkout and place a hold for [% INCLUDE 'patron-title.inc' %]</button> >+ <button type="submit" onclick="window.location.href='/cgi-bin/koha/reserve/request.pl?biblionumber=[% itembiblionumber %]&borrowernumber=[% patron.borrowernumber %]'"><i class="fa fa-sticky-note-o"></i> Cancel checkout and place a hold for [% INCLUDE 'patron-title.inc' %]</button> > [% END %] > [% END %] > </div></div> >@@ -326,7 +326,7 @@ > > [% IF ( fast_cataloging ) %] > [% IF ( CAN_user_editcatalogue_fast_cataloging ) %] >- <a class="approve" href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA&barcode=[% barcode |uri %]&circborrowernumber=[% borrowernumber %]&branch=[% branch %]&duedatespec=[% duedatespec %]&stickyduedate=[% stickyduedate %]"><i class="fa fa-plus"></i> Add record using fast cataloging</a> >+ <a class="approve" href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA&barcode=[% barcode |uri %]&circborrowernumber=[% patron.borrowernumber %]&branch=[% branch %]&duedatespec=[% duedatespec %]&stickyduedate=[% stickyduedate %]"><i class="fa fa-plus"></i> Add record using fast cataloging</a> > [% END %] > [% END %] > </div> >@@ -437,7 +437,7 @@ > <input type="hidden" name="forceallow" value="1"> > [% END %] > <input type="hidden" name="restoreduedatespec" /> >- <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" /> >+ <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" /> > <input type="hidden" name="duedatespec" value="[% duedatespec %]" /> > <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" /> > <input type="hidden" name="branch" value="[% branch %]" /> >@@ -487,7 +487,7 @@ No patron matched <span class="ex">[% message | html %]</span> > > <!-- BARCODE ENTRY --> > >-[% IF borrowernumber and borrower %] >+[% IF patron %] > <div class="yui-g"> > > [% IF privacy == 2 AND NOT Koha.Preference('AnonymousPatron') %] >@@ -597,7 +597,7 @@ No patron matched <span class="ex">[% message | html %]</span> > > </div> <!-- /.checkout-settings --> > >- <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="print" value="maybe" /> > <input type="hidden" name="debt_confirmed" value="[% debt_confirmed %]" /> >@@ -655,7 +655,7 @@ No patron matched <span class="ex">[% message | html %]</span> > > [% IF ( warndeparture ) %] > <li><span class="circ-hlt">Expiration:</span> Patron's card will expire soon. >- Patron's card expires on [% expiry | $KohaDates %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&destination=circ&reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% borrowernumber %]&categorycode=[% categorycode %]">Edit Details</a> >+ Patron's card expires on [% expiry | $KohaDates %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber %]&destination=circ&reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% patron.borrowernumber %]&categorycode=[% categorycode %]">Edit Details</a> > > </li> > [% END %] >@@ -668,7 +668,7 @@ No patron matched <span class="ex">[% message | html %]</span> > > [% IF ( expired ) %] > <li><span class="circ-hlt">Expiration:</span> Patron's card has expired. >- [% IF ( expiry ) %]Patron's card expired on [% expiry | $KohaDates %][% END %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&destination=circ&reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% borrowernumber %]&categorycode=[% categorycode %]">Edit Details</a> >+ [% IF ( expiry ) %]Patron's card expired on [% expiry | $KohaDates %][% END %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber %]&destination=circ&reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% patron.borrowernumber %]&categorycode=[% categorycode %]">Edit Details</a> > > </li> > [% END %] >@@ -700,9 +700,9 @@ No patron matched <span class="ex">[% message | html %]</span> > [% END %] > <br/> > <a class="btn btn-default btn-sm" href="#reldebarments" onclick="$('#debarments-tab-link').click()"><i class="fa fa-ban"></i> View restrictions</a> >- [% IF (noissues && borrowernumber && CAN_user_circulate_force_checkout) %] >+ [% IF (noissues && patron && CAN_user_circulate_force_checkout) %] > <span class="override_debarment"> >- <a href="/cgi-bin/koha/circ/circulation.pl?forceallow=1&borrowernumber=[% borrowernumber %]" class="btn btn-default btn-sm">Override restriction temporarily</a> >+ <a href="/cgi-bin/koha/circ/circulation.pl?forceallow=1&borrowernumber=[% patron.borrowernumber %]" class="btn btn-default btn-sm">Override restriction temporarily</a> > </span> > [% END %] > </li> >@@ -902,7 +902,7 @@ No patron matched <span class="ex">[% message | html %]</span> > <fieldset class="action"> > <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post"> > <input type="hidden" name="from" value="circ" /> >- <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" /> >+ <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" /> > <input type="submit" value="Suspend all holds" /> > > [% IF Koha.Preference('AutoResumeSuspendedHolds') %] >@@ -916,7 +916,7 @@ No patron matched <span class="ex">[% message | html %]</span> > <fieldset class="action"> > <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post"> > <input type="hidden" name="from" value="circ" /> >- <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" /> >+ <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" /> > <input type="hidden" name="suspend" value="0" /> > <input type="submit" value="Resume all suspended holds" /> > </form> >@@ -934,12 +934,12 @@ No patron matched <span class="ex">[% message | html %]</span> > > [% ELSIF borrowernumber %] > <div class="dialog message">This patron does not exist. <a href="/cgi-bin/koha/members/members-home.pl">Find another patron?</a></div> >-[% END %] <!-- borrowernumber and borrower--> >+[% END %] > </div></div> > [% END %] > [% IF Koha.Preference('CircSidebar') %] > [% UNLESS ( borrowers ) %] >- [% IF not( borrowernumber and borrower ) %] >+ [% IF not( borrowernumber and patron ) %] > <div class="yui-b noprint"> > [% INCLUDE 'circ-nav.inc' %] > </div> >@@ -949,7 +949,7 @@ No patron matched <span class="ex">[% message | html %]</span> > </div> > </div> > [% UNLESS ( borrowers ) %] >- [% IF borrowernumber and borrower %] >+ [% IF borrowernumber and patron %] > <div class="yui-b"> > [% INCLUDE 'circ-menu.inc' %] > </div> >@@ -988,7 +988,7 @@ No patron matched <span class="ex">[% message | html %]</span> > var MSG_DT_LOADING_RECORDS = _("Loading... you may continue scanning."); > var interface = "[% interface %]"; > var theme = "[% theme %]"; >- var borrowernumber = "[% borrowernumber %]"; >+ var borrowernumber = "[% patron.borrowernumber %]"; > var branchcode = "[% branch %]"; > var exports_enabled = "[% Koha.Preference('ExportCircHistory') %]"; > var AllowRenewalLimitOverride = [% (CAN_user_circulate_override_renewals && Koha.Preference('AllowRenewalLimitOverride') )? 1: 0 %]; >@@ -1013,15 +1013,15 @@ No patron matched <span class="ex">[% message | html %]</span> > > columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) %] > >- [% IF borrowernumber and borrower %] >- if($.cookie("holdfor") != [% borrowernumber %]){ >+ [% IF borrowernumber and patron %] >+ if($.cookie("holdfor") != [% patron.borrowernumber %]){ > $.removeCookie("holdfor", { path: '/' }); > } > [% ELSE %] > $.removeCookie("holdfor", { path: '/' }); > [% END %] > >- [% UNLESS ( borrowernumber ) %][% UNLESS ( borrowers ) %]window.onload=function(){ $('#findborrower').focus(); };[% END %][% END %] >+ [% UNLESS ( patron.borrowernumber ) %][% UNLESS ( borrowers ) %]window.onload=function(){ $('#findborrower').focus(); };[% END %][% END %] > > // On-site checkout > function toggle_onsite_checkout(){ >@@ -1061,7 +1061,7 @@ No patron matched <span class="ex">[% message | html %]</span> > if ( $('#clubs-tab').length ) { > $('#clubs-tab-link').on('click', function() { > $('#clubs-tab').text(_("Loading...")); >- $('#clubs-tab').load('/cgi-bin/koha/clubs/patron-clubs-tab.pl?borrowernumber=[% borrowernumber %]'); >+ $('#clubs-tab').load('/cgi-bin/koha/clubs/patron-clubs-tab.pl?borrowernumber=[% patron.borrowernumber %]'); > }); > } > >-- >2.1.4
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=71725">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
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