gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 22922: Allow reservedate changes only if AllowHoldDateInFuture is on 

Signed-off-by: Maryse Simard <maryse.simard@inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
This commit is contained in:
Julian Maurice 2019-05-17 14:40:12 +02:00 committed by Martin Renvoize
parent 8d047f2a33
commit 95174eb36a
No known key found for this signature in database
GPG Key ID: 422B469130441A0F
3 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
C4/Reserves.pm
View File

@ -906,8 +906,6 @@ sub ModReserve {
my $rank = $params->{'rank'};
my $reserve_id = $params->{'reserve_id'};
my $reservedate = $params->{reservedate} || undef;
my $expirationdate = $params->{expirationdate} || undef;
my $branchcode = $params->{'branchcode'};
my $itemnumber = $params->{'itemnumber'};
my $suspend_until = $params->{'suspend_until'};
@ -936,17 +934,21 @@ sub ModReserve {
logaction( 'HOLDS', 'MODIFY', $hold->reserve_id, Dumper($hold->unblessed) )
if C4::Context->preference('HoldsLog');
$hold->set(
{
priority => $rank,
reservedate => $reservedate,
expirationdate => $expirationdate,
branchcode => $branchcode,
itemnumber => $itemnumber,
found => undef,
waitingdate => undef
}
)->store();
my $properties = {
priority => $rank,
branchcode => $branchcode,
itemnumber => $itemnumber,
found => undef,
waitingdate => undef
};
if (exists $params->{reservedate}) {
$properties->{reservedate} = $params->{reservedate} || undef;
}
if (exists $params->{expirationdate}) {
$properties->{expirationdate} = $params->{expirationdate} || undef;
}
$hold->set($properties)->store();
if ( defined( $suspend_until ) ) {
if ( $suspend_until ) {

8
koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc
View File

@ -106,7 +106,13 @@
</td>
<td>[% hold.notes | html %]</td>
<td><input type="date" value="[% hold.date | html %]" required name="reservedate"></td>
<td>
[% IF Koha.Preference('AllowHoldDateInFuture') %]
<input type="date" value="[% hold.date | html %]" required name="reservedate">
[% ELSE %]
[% hold.date | $KohaDates %]
[% END %]
</td>
<td><input type="date" value="[% hold.expirationdate | html %]" name="expirationdate"></td>
<td>

10
reserve/modrequest.pl
View File

@ -69,15 +69,19 @@ if ($CancelBorrowerNumber) {
else {
for (my $i=0;$i<$count;$i++){
undef $itemnumber[$i] if !$itemnumber[$i];
ModReserve({
my $params = {
rank => $rank[$i],
reserve_id => $reserve_id[$i],
reservedate => $reservedates[$i],
expirationdate => $expirationdates[$i],
branchcode => $branch[$i],
itemnumber => $itemnumber[$i],
suspend_until => $suspend_until[$i]
});
};
if (C4::Context->preference('AllowHoldDateInFuture')) {
$params->{reservedate} = $reservedates[$i];
}
ModReserve($params);
}
}