Jonathan Druart
cee2cf9ff9
Test plan: Login with a patron that is not allowed to see patron's information for patrons outside of his group. Try to access patron's information from scripts of the patron module (members/*) and circ/circulation.pl. You should be able to access patron's information of patrons outside of your group and get "You are not allowed to see the information of this patron." If you try and access a patron page with a borrowernumber that does not exist, you should get "This patron does not exist" Technical note: A new C4::Output subroutine is created in this patch: "output_and_exit_if_error" Executed at the beginning of the script it will permit not to copy/paste all the different checks to know if the logged in user is authorised to see patron's information. The design here can be discussed, but I did not find an alternative with as less changes. On the way I refactor what we did with 'unknowuser' previously: it will now work with all patron pages, not only the few that used it. Note that the 'or die "Not logged in";' part should not be needed, but... who trusts C4::Auth? I think it could be used as a safeguard later. I am willing to sed and remove them if required. Changes in discharge.pl are mainly indentation changes. With this patch we should now have a $patron variable that refer to the patron we want to access. That will be very useful to remove plenty of code in members/* and only pass this variable to the template (instead of 1 variable per patron's attribute). Signed-off-by: Signed-off-by: Jon McGowan <jon.mcgowan@ptfs-europe.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
73 lines
2.1 KiB
Text
73 lines
2.1 KiB
Text
[% USE KohaDates %]
|
|
[% USE AuthorisedValues %]
|
|
[% USE Branches %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Koha › Patrons › [% UNLESS blocking_error %]Discharge for [% firstname %] [% surname %] ([% cardnumber %])[% END %]</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
</head>
|
|
<body id="discharge" class="discharge">
|
|
[% INCLUDE 'header.inc' %]
|
|
[% INCLUDE 'patron-search.inc' %]
|
|
|
|
<div id="breadcrumbs">
|
|
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
|
|
› <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
|
|
› [% UNLESS blocking_error %]Discharge for [% firstname %] [% surname %] ([% cardnumber %])[% END %]
|
|
</div>
|
|
|
|
<div id="doc3" class="yui-t1">
|
|
<div id="bd">
|
|
<div id="yui-main">
|
|
<div class="yui-b">
|
|
<div class="yui-g">
|
|
<h3>Discharge</h3>
|
|
[% FOR message IN messages %]
|
|
<div class="dialog [% message.type %]">
|
|
[% IF message.code == "unable_to_generate_pdf" %]
|
|
An error occurs when generating the pdf file.
|
|
Please contact the administrator to resolve this problem.
|
|
[% END %]
|
|
</div>
|
|
[% END %]
|
|
[% UNLESS can_be_discharged %]
|
|
<p>Cannot edit discharge: the patron has checked out items.</p>
|
|
[% ELSE %]
|
|
[% IF has_reserves %]
|
|
<p>Borrower has reserves: they will be canceled if the discharge is generated.</p>
|
|
[% END %]
|
|
<form method="post">
|
|
<input type="submit" value="Generate discharge" name="discharge" />
|
|
<input type="hidden" value="[% borrowernumber %]" name="borrowernumber" />
|
|
</form>
|
|
[% END %]
|
|
|
|
[% IF validated_discharges %]
|
|
<h2>Already validated discharges</h2>
|
|
<table>
|
|
<thead>
|
|
<tr>
|
|
<th>Requested</th>
|
|
<th>Validated</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOR d IN validated_discharges %]
|
|
<tr>
|
|
<td>[% d.needed | $KohaDates with_hours = 1 %]</td>
|
|
<td>[% d.validated | $KohaDates with_hours = 1 %]</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
</table>
|
|
[% END %]
|
|
|
|
</div>
|
|
|
|
|
|
</div>
|
|
</div>
|
|
<div class="yui-b">
|
|
[% INCLUDE 'circ-menu.inc' %]
|
|
</div>
|
|
</div>
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|