View | Details | Raw Unified | Return to bug 11947
Collapse All | Expand All

(-)a/C4/Reserves.pm (-1 / +1 lines)
Lines 1296-1302 sub ModReserveAffect { Link Here
1296
    $sth = $dbh->prepare($query);
1296
    $sth = $dbh->prepare($query);
1297
    $sth->execute( $itemnumber, $borrowernumber,$biblionumber);
1297
    $sth->execute( $itemnumber, $borrowernumber,$biblionumber);
1298
    _koha_notify_reserve( $itemnumber, $borrowernumber, $biblionumber ) if ( !$transferToDo && !$already_on_shelf );
1298
    _koha_notify_reserve( $itemnumber, $borrowernumber, $biblionumber ) if ( !$transferToDo && !$already_on_shelf );
1299
1299
    _FixPriority( { biblionumber => $biblionumber } );
1300
    if ( C4::Context->preference("ReturnToShelvingCart") ) {
1300
    if ( C4::Context->preference("ReturnToShelvingCart") ) {
1301
      CartToShelf( $itemnumber );
1301
      CartToShelf( $itemnumber );
1302
    }
1302
    }
(-)a/t/db_dependent/Reserves.t (-2 / +25 lines)
Lines 2-8 Link Here
2
2
3
use Modern::Perl;
3
use Modern::Perl;
4
4
5
use Test::More tests => 31;
5
use Test::More tests => 34;
6
use MARC::Record;
6
use MARC::Record;
7
use DateTime::Duration;
7
use DateTime::Duration;
8
8
Lines 199-204 my ($itemnum_cpl, $itemnum_fpl); Link Here
199
        barcode => 'bug10272_FPL'
199
        barcode => 'bug10272_FPL'
200
    } , $bibnum2);
200
    } , $bibnum2);
201
201
202
# Ensure that priorities are numbered correcly when a hold is moved to waiting
203
# (bug 11947)
204
$dbh->do("DELETE FROM reserves WHERE biblionumber=?",undef,($bibnum2));
205
AddReserve('RPL',  $requesters{'RPL'}, $bibnum2,
206
           $constraint, $bibitems,  1, $resdate, $expdate, $notes,
207
           $title,      $checkitem, $found);
208
AddReserve('FPL',  $requesters{'FPL'}, $bibnum2,
209
           $constraint, $bibitems,  2, $resdate, $expdate, $notes,
210
           $title,      $checkitem, $found);
211
AddReserve('CPL',  $requesters{'CPL'}, $bibnum2,
212
           $constraint, $bibitems,  3, $resdate, $expdate, $notes,
213
           $title,      $checkitem, $found);
214
ModReserveAffect($itemnum_cpl, $requesters{'RPL'}, 0);
215
216
# Now it should have different priorities.
217
my ($count, $title_reserves) = GetReservesFromBiblionumber($bibnum2);
218
# Sort by reserve number in case the database gives us oddly ordered results
219
my @reserves = sort { $a->{reserve_id} <=> $b->{reserve_id} } @$title_reserves;
220
is($reserves[0]{priority}, 0, 'Item is correctly waiting');
221
is($reserves[1]{priority}, 1, 'Item is correctly priority 1');
222
is($reserves[2]{priority}, 2, 'Item is correctly priority 2');
223
224
225
$dbh->do("DELETE FROM reserves WHERE biblionumber=?",undef,($bibnum2));
202
AddReserve('RPL',  $requesters{'RPL'}, $bibnum2,
226
AddReserve('RPL',  $requesters{'RPL'}, $bibnum2,
203
           $constraint, $bibitems,  1, $resdate, $expdate, $notes,
227
           $constraint, $bibitems,  1, $resdate, $expdate, $notes,
204
           $title,      $checkitem, $found);
228
           $title,      $checkitem, $found);
205
- 

Return to bug 11947