@@ -, +, @@ date --- circ/circulation.pl | 24 +++++++++++++------- .../prog/en/modules/circ/circulation.tt | 21 ++++++++++------- 2 files changed, 29 insertions(+), 16 deletions(-) --- a/circ/circulation.pl +++ a/circ/circulation.pl @@ -55,7 +55,6 @@ use Date::Calc qw( ); use List::MoreUtils qw/uniq/; - # # PARAMETERS READING # @@ -156,7 +155,6 @@ $findborrower =~ s|,| |g; $branch = C4::Context->userenv->{'branch'}; $printer = C4::Context->userenv->{'branchprinter'}; - # If AutoLocation is not activated, we show the Circulation Parameters to chage settings of librarian if (C4::Context->preference("AutoLocation") != 1) { $template->param(ManualLocation => 1); @@ -176,7 +174,10 @@ my $stickyduedate = $query->param('stickyduedate') || $session->param('stickydu my $duedatespec = $query->param('duedatespec') || $session->param('stickyduedate'); $duedatespec = eval { output_pref( { dt => dt_from_string( $duedatespec ), dateformat => 'iso' }); } if ( $duedatespec ); - +my $restoreduedatespec = $query->param('restoreduedatespec') || $session->param('stickyduedate') || $duedatespec; +if ($restoreduedatespec eq "highholds_empty") { + undef $restoreduedatespec; +} my $issueconfirmed = $query->param('issueconfirmed'); my $cancelreserve = $query->param('cancelreserve'); my $print = $query->param('print') || q{}; @@ -577,6 +578,17 @@ my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{stree $template->param(%$borrower); +# Restore date if changed by holds and/or save stickyduedate to session +if ($restoreduedatespec || $stickyduedate) { + $duedatespec = $restoreduedatespec || $duedatespec; + + if ($stickyduedate) { + $session->param( 'stickyduedate', $duedatespec ); + } +} elsif (defined($duedatespec) && !defined($restoreduedatespec)) { + undef $duedatespec; +} + $template->param( lib_messages_loop => $lib_messages_loop, bor_messages_loop => $bor_messages_loop, @@ -595,6 +607,7 @@ $template->param( barcodes => $barcodes, stickyduedate => $stickyduedate, duedatespec => $duedatespec, + restoreduedatespec => $restoreduedatespec, message => $message, totaldue => sprintf('%.2f', $total), inprocess => $inprocess, @@ -612,11 +625,6 @@ $template->param( relatives_borrowernumbers => \@relatives, ); -# save stickyduedate to session -if ($stickyduedate) { - $session->param( 'stickyduedate', $duedatespec ); -} - my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'}); $template->param( picture => 1 ) if $picture; --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -315,13 +315,19 @@ $(document).ready(function() { [% IF HIGHHOLDS %] [% END %] [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
+ [% IF (forceallow) %][% END %] @@ -366,6 +372,7 @@ $(document).ready(function() { [% IF ( RESERVED ) %] + @@ -375,6 +382,7 @@ $(document).ready(function() { [% IF ( RESERVE_WAITING ) %] + @@ -386,6 +394,7 @@ $(document).ready(function() { [% IF (forceallow) %][% END %] + [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %] [% IF ( RENEW_ISSUE ) %] @@ -434,6 +443,7 @@ $(document).ready(function() {
[% IF (forceallow) %][% END %] + @@ -545,11 +555,11 @@ No patron matched [% message %] [% END %] - [% IF ( borrowers ) %] [% INCLUDE 'patron-toolbar.inc' %] +
Patron selection @@ -605,8 +615,8 @@ No patron matched [% message %] [% END %] - + [% IF ( issue ) %]
[% ELSE %] @@ -791,8 +801,6 @@ No patron matched [% message %] [% END %] - - @@ -860,7 +868,6 @@ No patron matched [% message %] [% END %] - @@ -976,8 +983,6 @@ No patron matched [% message %] [% END %] - - [% UNLESS ( borrowers ) %][% IF ( borrowernumber ) %]
--