Bug 36376: Display library limitations alert in patron's messages
Bug 31422 added a warning message when library limitations issue in patron edition page.
We should add this patron's messages in circ and details pages.
Like age limitations.
Test plan:
1) User's login branch and home library is: Centerville
2) Patron category "B - Board" is limited to Franklin
3) Edit a patron with Board category from Centerville
4) A message appears "The patron's current category (Board) is limited to other libraries."
Signed-off-by: Laura Escamilla <laura.escamilla@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 841dc00ec8
)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
parent
c305b46821
commit
ebd8a50e6e
3 changed files with 17 additions and 1 deletions
|
@ -306,6 +306,9 @@ if ($patron) {
|
||||||
$template->param( age_high => $patron->category->upperagelimit );
|
$template->param( age_high => $patron->category->upperagelimit );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unless ( Koha::Patron::Categories->search_with_library_limits( { 'me.categorycode' => $patron->categorycode } )->count ) {
|
||||||
|
$template->param( limited_category => 1 );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
|
@ -1,10 +1,11 @@
|
||||||
[% USE raw %]
|
[% USE raw %]
|
||||||
[% USE Branches %]
|
[% USE Branches %]
|
||||||
|
[% USE Categories %]
|
||||||
[% SET ClaimReturnedWarningThreshold = Koha.Preference('ClaimReturnedWarningThreshold') %]
|
[% SET ClaimReturnedWarningThreshold = Koha.Preference('ClaimReturnedWarningThreshold') %]
|
||||||
[% SET return_claims = patron.return_claims %]
|
[% SET return_claims = patron.return_claims %]
|
||||||
[% SET logged_in_branchcode = Branches.GetLoggedInBranchcode() %]
|
[% SET logged_in_branchcode = Branches.GetLoggedInBranchcode() %]
|
||||||
|
|
||||||
[% IF ( has_modifications || warndeparture || returnbeforeexpiry || expired || patron.gonenoaddress || patron.lost || userdebarred || odues || ( return_claims.count > ClaimReturnedWarningThreshold ) || age_limitations || charges || charges_guarantors_guarantees || charges_guarantees || credits ) %]
|
[% IF ( has_modifications || warndeparture || returnbeforeexpiry || expired || patron.gonenoaddress || patron.lost || userdebarred || odues || ( return_claims.count > ClaimReturnedWarningThreshold ) || age_limitations || limited_category || charges || charges_guarantors_guarantees || charges_guarantees || credits ) %]
|
||||||
<h3>Attention</h3>
|
<h3>Attention</h3>
|
||||||
<ul>
|
<ul>
|
||||||
[% IF ( has_modifications ) %]
|
[% IF ( has_modifications ) %]
|
||||||
|
@ -97,6 +98,13 @@
|
||||||
</li>
|
</li>
|
||||||
[% END %]
|
[% END %]
|
||||||
|
|
||||||
|
[% IF limited_category %]
|
||||||
|
<li class="limited_category">
|
||||||
|
<span class="circ-hlt">The patron's current category ([% Categories.GetName(patron.categorycode) | html %]) is limited to other libraries.</span>
|
||||||
|
<a href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&borrowernumber=[% patron.borrowernumber | uri %]&step=3" class="btn btn-default btn-xs">Change category</a>
|
||||||
|
</li>
|
||||||
|
[% END %]
|
||||||
|
|
||||||
[% IF ( charges ) %]
|
[% IF ( charges ) %]
|
||||||
[% INCLUDE 'blocked-fines.inc' fines = chargesamount %]
|
[% INCLUDE 'blocked-fines.inc' fines = chargesamount %]
|
||||||
[% END %]
|
[% END %]
|
||||||
|
|
|
@ -37,6 +37,7 @@ use List::MoreUtils qw( uniq );
|
||||||
use Scalar::Util qw( looks_like_number );
|
use Scalar::Util qw( looks_like_number );
|
||||||
use Koha::Patron::Attribute::Types;
|
use Koha::Patron::Attribute::Types;
|
||||||
use Koha::Patron::Restriction::Types;
|
use Koha::Patron::Restriction::Types;
|
||||||
|
use Koha::Patron::Categories;
|
||||||
use Koha::Patron::Messages;
|
use Koha::Patron::Messages;
|
||||||
use Koha::CsvProfiles;
|
use Koha::CsvProfiles;
|
||||||
use Koha::Holds;
|
use Koha::Holds;
|
||||||
|
@ -137,6 +138,10 @@ $template->param(
|
||||||
csrf_token => Koha::Token->new->generate_csrf({ session_id => $input->cookie('CGISESSID'),}),
|
csrf_token => Koha::Token->new->generate_csrf({ session_id => $input->cookie('CGISESSID'),}),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
unless ( Koha::Patron::Categories->search_with_library_limits( { 'me.categorycode' => $patron->categorycode } )->count ) {
|
||||||
|
$template->param( limited_category => 1 );
|
||||||
|
}
|
||||||
|
|
||||||
if (C4::Context->preference('ExtendedPatronAttributes')) {
|
if (C4::Context->preference('ExtendedPatronAttributes')) {
|
||||||
my @attributes = $patron->extended_attributes->as_list; # FIXME Must be improved!
|
my @attributes = $patron->extended_attributes->as_list; # FIXME Must be improved!
|
||||||
my @classes = uniq( map {$_->type->class} @attributes );
|
my @classes = uniq( map {$_->type->class} @attributes );
|
||||||
|
|
Loading…
Reference in a new issue