Attachment 62023 Details for Bug 18403 – Bug 18403: output_and_exit_if_error for circulation.pl

[patch] Bug 18403: output_and_exit_if_error for circulation.pl

Bug-18403-outputandexitiferror-for-circulationpl.patch (text/plain), 2.66 KB, created by Jonathan Druart on 2017-04-10 21:33:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2017-04-10 21:33:24 UTC

Size: 2.66 KB

patch

obsolete

>From 2bc6c4f2727a61185dbc145800a50de32a23cf43 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Wed, 5 Apr 2017 18:55:13 -0300
>Subject: [PATCH] Bug 18403: output_and_exit_if_error for circulation.pl
>
>This is a follow-up for a previous patch, changes have been tested
>already
>---
> circ/circulation.pl                                                  | 5 +++++
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt          | 2 +-
> .../prog/en/modules/circ/circulation_batch_checkouts.tt              | 2 +-
> 3 files changed, 7 insertions(+), 2 deletions(-)
>
>diff --git a/circ/circulation.pl b/circ/circulation.pl
>index 3385c40..db1d958 100755
>--- a/circ/circulation.pl
>+++ b/circ/circulation.pl
>@@ -128,6 +128,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user (
>         flagsrequired   => { circulate => 'circulate_remaining_permissions' },
>     }
> );
>+my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
> 
> my $force_allow_issue = $query->param('forceallow') || 0;
> if (!C4::Auth::haspermission( C4::Context->userenv->{id} , { circulate => 'force_checkout' } )) {
>@@ -262,6 +263,10 @@ if ($findborrower) {
> # get the borrower information.....
> if ($borrowernumber) {
>     $patron = Koha::Patrons->find( $borrowernumber );
>+
>+    $template->param( borrowernumber => $patron->borrowernumber );
>+    output_and_exit_if_error( $query, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
>+
>     my $overdues = $patron->get_overdues;
>     my $issues = $patron->checkouts;
>     my $balance = $patron->account->balance;
>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 3e3a5e1..4a65cb0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>@@ -145,7 +145,7 @@ $(document).ready(function() {
> 	<div class="yui-b">
> [% END %]
> 
>-[% IF borrowernumber and borrower %]
>+[% IF borrowernumber %]
> [% INCLUDE 'members-toolbar.inc' %]
> [% END %]
> 
>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 e1c7c14..cec374c 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
>@@ -57,7 +57,7 @@ $(document).ready(function() {
> 
> <div class="yui-g">
> 
>-[% IF borrowernumber and borrower %]
>+[% IF borrowernumber %]
> [% INCLUDE 'members-toolbar.inc' %]
> [% END %]
> 
>-- 
>2.9.3

Actions: View | Diff | Splinter Review

Attachments on bug 18403: 62010 | 62011 | 62012 | 62013 | 62014 | 62015 | 62016 | 62017 | 62018 | 62019 | 62020 | 62021 | 62022 | 62023 | 62024 | 62025 | 62026 | 62027 | 62028 | 62029 | 62030 | 62031 | 62032 | 62033 | 62302 | 62303 | 62830 | 62831 | 62832 | 62833 | 62834 | 62835 | 62836 | 62837 | 62838 | 62839 | 62840 | 62841 | 62842 | 62843 | 62844 | 62845 | 62846 | 62847 | 62848 | 62849 | 62850 | 62851 | 62852 | 62853 | 62854 | 62855 | 71392 | 71394 | 71500 | 71501 | 71502 | 71503 | 71504 | 71505 | 71506 | 71507 | 71508 | 71509 | 71510 | 71511 | 71512 | 71513 | 71514 | 71515 | 71516 | 71517 | 71518 | 71519 | 71520 | 71521 | 71522 | 71523 | 71524 | 71525 | 71526 | 71527 | 71528 | 71529 | 71530 | 71767