diff --git a/C4/HoldsQueue.pm b/C4/HoldsQueue.pm index b5a889b922..58085950c0 100644 --- a/C4/HoldsQueue.pm +++ b/C4/HoldsQueue.pm @@ -763,7 +763,7 @@ sub MapItemsToHoldRequests { my $LocalHoldsPriority = C4::Context->preference('LocalHoldsPriority'); my $LocalHoldsPriorityScope = C4::Context->preference('LocalHoldsPriorityScope'); - if ( $LocalHoldsPriority ne 'None' && $LocalHoldsPriorityScope eq 'checkin_and_queue' ) { + if ( $LocalHoldsPriority ne 'None' && $LocalHoldsPriorityScope eq 'capture_and_queue' ) { my $LocalHoldsPriorityPatronControl = C4::Context->preference('LocalHoldsPriorityPatronControl'); my $LocalHoldsPriorityItemControl = C4::Context->preference('LocalHoldsPriorityItemControl'); foreach my $request (@$hold_requests) { diff --git a/installer/data/mysql/atomicupdate/bug_42490.pl b/installer/data/mysql/atomicupdate/bug_42490.pl index e9da94147a..2049f03a87 100755 --- a/installer/data/mysql/atomicupdate/bug_42490.pl +++ b/installer/data/mysql/atomicupdate/bug_42490.pl @@ -10,13 +10,10 @@ return { $dbh->do( q{ - INSERT IGNORE INTO systempreferences (variable, value, options, explanation, type) + INSERT IGNORE INTO systempreferences (variable, value) VALUES ( 'LocalHoldsPriorityScope', - 'checkin_and_queue', - NULL, - 'Define whether these settings are used when building the holds queue or only when checking items in', - 'Choice' + 'capture_and_queue' ) } ); diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql index 3a56a64d51..eef167f463 100644 --- a/installer/data/mysql/mandatory/sysprefs.sql +++ b/installer/data/mysql/mandatory/sysprefs.sql @@ -426,7 +426,7 @@ INSERT INTO systempreferences ( `variable`, `value` ) VALUES ('LocalHoldsPriority', 'None'), ('LocalHoldsPriorityItemControl', 'holdingbranch'), ('LocalHoldsPriorityPatronControl', 'PickupLibrary'), -('LocalHoldsPriorityScope', 'checkin_and_queue'), +('LocalHoldsPriorityScope', 'capture_and_queue'), ('LockExpiredDelay',''), ('LostChargesControl','ItemHomeLibrary'), ('makePreviousSerialAvailable','0'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref index 1851e8ca7b..18f5ad9eaf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref @@ -1118,8 +1118,8 @@ Circulation: - when - pref: LocalHoldsPriorityScope choices: - checkin_and_queue: "checking items in and building the holds queue" - checkin_only: "checking items in" + capture_and_queue: "checking items in and building the holds queue" + capture_only: "checking items in" -
Note: If a group option is selected, LocalHoldsPriorityPatronControl and LocalHoldsPriorityItemControl will use the library hold group of the selected libraries. - - For diff --git a/t/db_dependent/HoldsQueue.t b/t/db_dependent/HoldsQueue.t index db595a0f96..4f410ffcda 100755 --- a/t/db_dependent/HoldsQueue.t +++ b/t/db_dependent/HoldsQueue.t @@ -437,7 +437,7 @@ t::lib::Mocks::mock_preference( 'HoldsQueueSkipClosed', 0 ); ## Test LocalHoldsPriority t::lib::Mocks::mock_preference( 'LocalHoldsPriority', 'GiveLibrary' ); -t::lib::Mocks::mock_preference( 'LocalHoldsPriorityScope', 'checkin_and_queue' ); +t::lib::Mocks::mock_preference( 'LocalHoldsPriorityScope', 'capture_and_queue' ); $dbh->do("DELETE FROM circulation_rules"); Koha::CirculationRules->set_rule( @@ -1036,7 +1036,7 @@ subtest "Test Local Holds Priority - Bib level" => sub { Koha::Biblios->delete(); t::lib::Mocks::mock_preference( 'LocalHoldsPriority', 'GiveLibrary' ); - t::lib::Mocks::mock_preference( 'LocalHoldsPriorityScope', 'checkin_and_queue' ); + t::lib::Mocks::mock_preference( 'LocalHoldsPriorityScope', 'capture_and_queue' ); t::lib::Mocks::mock_preference( 'LocalHoldsPriorityPatronControl', 'PickupLibrary' ); t::lib::Mocks::mock_preference( 'LocalHoldsPriorityItemControl', 'homebranch' ); my $branch = $builder->build_object( { class => 'Koha::Libraries' } ); @@ -1108,7 +1108,7 @@ subtest "Test Local Holds Priority - Item level" => sub { Koha::Biblios->delete(); t::lib::Mocks::mock_preference( 'LocalHoldsPriority', 'GiveLibrary' ); - t::lib::Mocks::mock_preference( 'LocalHoldsPriorityScope', 'checkin_and_queue' ); + t::lib::Mocks::mock_preference( 'LocalHoldsPriorityScope', 'capture_and_queue' ); t::lib::Mocks::mock_preference( 'LocalHoldsPriorityPatronControl', 'PickupLibrary' ); t::lib::Mocks::mock_preference( 'LocalHoldsPriorityItemControl', 'homebranch' ); my $branch = $builder->build_object( { class => 'Koha::Libraries' } ); @@ -1175,7 +1175,7 @@ subtest "Test Local Holds Priority - Item level" => sub { "We should pick the local hold over the next available" ); - t::lib::Mocks::mock_preference( 'LocalHoldsPriorityScope', 'checkin_only' ); + t::lib::Mocks::mock_preference( 'LocalHoldsPriorityScope', 'capture_only' ); C4::HoldsQueue::CreateQueue(); my $queue_rs2 = $schema->resultset('TmpHoldsqueue'); @@ -1198,7 +1198,7 @@ subtest "Test Local Holds Priority - Item level hold over Record level hold (Bug t::lib::Mocks::mock_preference( 'LocalHoldsPriority', 'GiveLibrary' ); t::lib::Mocks::mock_preference( 'LocalHoldsPriorityPatronControl', 'PickupLibrary' ); t::lib::Mocks::mock_preference( 'LocalHoldsPriorityItemControl', 'homebranch' ); - t::lib::Mocks::mock_preference( 'LocalHoldsPriorityScope', 'checkin_and_queue' ); + t::lib::Mocks::mock_preference( 'LocalHoldsPriorityScope', 'capture_and_queue' ); my $branch = $builder->build_object( { class => 'Koha::Libraries' } ); my $branch2 = $builder->build_object( { class => 'Koha::Libraries' } ); my $category = $builder->build_object( @@ -1268,7 +1268,7 @@ subtest "Test Local Holds Priority - Get correct item for item level hold" => su Koha::Biblios->delete(); t::lib::Mocks::mock_preference( 'LocalHoldsPriority', 'GiveLibrary' ); - t::lib::Mocks::mock_preference( 'LocalHoldsPriorityScope', 'checkin_and_queue' ); + t::lib::Mocks::mock_preference( 'LocalHoldsPriorityScope', 'capture_and_queue' ); t::lib::Mocks::mock_preference( 'LocalHoldsPriorityPatronControl', 'PickupLibrary' ); t::lib::Mocks::mock_preference( 'LocalHoldsPriorityItemControl', 'homebranch' ); my $branch = $builder->build_object( { class => 'Koha::Libraries' } ); @@ -1353,7 +1353,7 @@ subtest "Test Local Holds Priority - Ensure no duplicate requests in holds queue Koha::Biblios->delete(); t::lib::Mocks::mock_preference( 'LocalHoldsPriority', 'GiveLibrary' ); - t::lib::Mocks::mock_preference( 'LocalHoldsPriorityScope', 'checkin_and_queue' ); + t::lib::Mocks::mock_preference( 'LocalHoldsPriorityScope', 'capture_and_queue' ); t::lib::Mocks::mock_preference( 'LocalHoldsPriorityPatronControl', 'PickupLibrary' ); t::lib::Mocks::mock_preference( 'LocalHoldsPriorityItemControl', 'homebranch' ); my $branch = $builder->build_object( { class => 'Koha::Libraries' } ); @@ -1519,7 +1519,7 @@ subtest 'Excludes from local holds priority' => sub { Koha::Holds->delete; t::lib::Mocks::mock_preference( 'LocalHoldsPriority', 'GiveLibrary' ); - t::lib::Mocks::mock_preference( 'LocalHoldsPriorityScope', 'checkin_and_queue' ); + t::lib::Mocks::mock_preference( 'LocalHoldsPriorityScope', 'capture_and_queue' ); t::lib::Mocks::mock_preference( 'LocalHoldsPriorityPatronControl', 'PickupLibrary' ); t::lib::Mocks::mock_preference( 'LocalHoldsPriorityItemControl', 'homebranch' ); @@ -2692,7 +2692,7 @@ subtest "local_holdgroup_match uses exclusivity controls, not LocalHoldsPriority # Exclusivity (PickupLibrary/holdingbranch): pickup lib_a vs lib_c holdingbranch -> NOT in group -> flag = 0 t::lib::Mocks::mock_preference( 'LocalHoldsPriority', 'GiveLibrary' ); - t::lib::Mocks::mock_preference( 'LocalHoldsPriorityScope', 'checkin_and_queue' ); + t::lib::Mocks::mock_preference( 'LocalHoldsPriorityScope', 'capture_and_queue' ); t::lib::Mocks::mock_preference( 'LocalHoldsPriorityPatronControl', 'HomeLibrary' ); t::lib::Mocks::mock_preference( 'LocalHoldsPriorityItemControl', 'homebranch' ); t::lib::Mocks::mock_preference( 'LocalHoldsExclusivityPeriod', 7 );