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

Bug 42490: (QA follow-up) Reword syspref description and options 

Signed-off-by: Pedro Amorim <pedro.amorim@openfifth.co.uk>
This commit is contained in:
Andrew Fuerste Henry 2026-09-28 13:28:41 +00:00 committed by Pedro Amorim
parent d8c245b505
commit 20223a3e16
No known key found for this signature in database
GPG Key ID: 06B75BA7F3894D55
5 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
C4/HoldsQueue.pm
View File

@ -763,7 +763,7 @@ sub MapItemsToHoldRequests {
my $LocalHoldsPriority = C4::Context->preference('LocalHoldsPriority'); my $LocalHoldsPriority = C4::Context->preference('LocalHoldsPriority');
my $LocalHoldsPriorityScope = C4::Context->preference('LocalHoldsPriorityScope'); 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 $LocalHoldsPriorityPatronControl = C4::Context->preference('LocalHoldsPriorityPatronControl');
my $LocalHoldsPriorityItemControl = C4::Context->preference('LocalHoldsPriorityItemControl'); my $LocalHoldsPriorityItemControl = C4::Context->preference('LocalHoldsPriorityItemControl');
foreach my $request (@$hold_requests) { foreach my $request (@$hold_requests) {

7
installer/data/mysql/atomicupdate/bug_42490.pl
View File

@ -10,13 +10,10 @@ return {
$dbh->do( $dbh->do(
q{ q{
INSERT IGNORE INTO systempreferences (variable, value, options, explanation, type) INSERT IGNORE INTO systempreferences (variable, value)
VALUES ( VALUES (
'LocalHoldsPriorityScope', 'LocalHoldsPriorityScope',
'checkin_and_queue', 'capture_and_queue'
NULL,
'Define whether these settings are used when building the holds queue or only when checking items in',
'Choice'
) )
} }
); );

2
installer/data/mysql/mandatory/sysprefs.sql
View File

@ -426,7 +426,7 @@ INSERT INTO systempreferences ( `variable`, `value` ) VALUES
('LocalHoldsPriority', 'None'), ('LocalHoldsPriority', 'None'),
('LocalHoldsPriorityItemControl', 'holdingbranch'), ('LocalHoldsPriorityItemControl', 'holdingbranch'),
('LocalHoldsPriorityPatronControl', 'PickupLibrary'), ('LocalHoldsPriorityPatronControl', 'PickupLibrary'),
('LocalHoldsPriorityScope', 'checkin_and_queue'), ('LocalHoldsPriorityScope', 'capture_and_queue'),
('LockExpiredDelay',''), ('LockExpiredDelay',''),
('LostChargesControl','ItemHomeLibrary'), ('LostChargesControl','ItemHomeLibrary'),
('makePreviousSerialAvailable','0'), ('makePreviousSerialAvailable','0'),

4
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
View File

@ -1118,8 +1118,8 @@ Circulation:
- when - when
- pref: LocalHoldsPriorityScope - pref: LocalHoldsPriorityScope
choices: choices:
checkin_and_queue: "checking items in and building the holds queue" capture_and_queue: "checking items in and building the holds queue"
checkin_only: "checking items in" capture_only: "checking items in"
- <br/><strong>Note:</strong> If a group option is selected, LocalHoldsPriorityPatronControl and LocalHoldsPriorityItemControl will use the <a href="/cgi-bin/koha/admin/library_groups.pl">library hold group</a> of the selected libraries. - <br/><strong>Note:</strong> If a group option is selected, LocalHoldsPriorityPatronControl and LocalHoldsPriorityItemControl will use the <a href="/cgi-bin/koha/admin/library_groups.pl">library hold group</a> of the selected libraries.
- -
- For - For

18
t/db_dependent/HoldsQueue.t
View File

@ -437,7 +437,7 @@ t::lib::Mocks::mock_preference( 'HoldsQueueSkipClosed', 0 );
## Test LocalHoldsPriority ## Test LocalHoldsPriority
t::lib::Mocks::mock_preference( 'LocalHoldsPriority', 'GiveLibrary' ); 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"); $dbh->do("DELETE FROM circulation_rules");
Koha::CirculationRules->set_rule( Koha::CirculationRules->set_rule(
@ -1036,7 +1036,7 @@ subtest "Test Local Holds Priority - Bib level" => sub {
Koha::Biblios->delete(); Koha::Biblios->delete();
t::lib::Mocks::mock_preference( 'LocalHoldsPriority', 'GiveLibrary' ); 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( 'LocalHoldsPriorityPatronControl', 'PickupLibrary' );
t::lib::Mocks::mock_preference( 'LocalHoldsPriorityItemControl', 'homebranch' ); t::lib::Mocks::mock_preference( 'LocalHoldsPriorityItemControl', 'homebranch' );
my $branch = $builder->build_object( { class => 'Koha::Libraries' } ); my $branch = $builder->build_object( { class => 'Koha::Libraries' } );
@ -1108,7 +1108,7 @@ subtest "Test Local Holds Priority - Item level" => sub {
Koha::Biblios->delete(); Koha::Biblios->delete();
t::lib::Mocks::mock_preference( 'LocalHoldsPriority', 'GiveLibrary' ); 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( 'LocalHoldsPriorityPatronControl', 'PickupLibrary' );
t::lib::Mocks::mock_preference( 'LocalHoldsPriorityItemControl', 'homebranch' ); t::lib::Mocks::mock_preference( 'LocalHoldsPriorityItemControl', 'homebranch' );
my $branch = $builder->build_object( { class => 'Koha::Libraries' } ); 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" "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(); C4::HoldsQueue::CreateQueue();
my $queue_rs2 = $schema->resultset('TmpHoldsqueue'); 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( 'LocalHoldsPriority', 'GiveLibrary' );
t::lib::Mocks::mock_preference( 'LocalHoldsPriorityPatronControl', 'PickupLibrary' ); t::lib::Mocks::mock_preference( 'LocalHoldsPriorityPatronControl', 'PickupLibrary' );
t::lib::Mocks::mock_preference( 'LocalHoldsPriorityItemControl', 'homebranch' ); 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 $branch = $builder->build_object( { class => 'Koha::Libraries' } );
my $branch2 = $builder->build_object( { class => 'Koha::Libraries' } ); my $branch2 = $builder->build_object( { class => 'Koha::Libraries' } );
my $category = $builder->build_object( 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(); Koha::Biblios->delete();
t::lib::Mocks::mock_preference( 'LocalHoldsPriority', 'GiveLibrary' ); 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( 'LocalHoldsPriorityPatronControl', 'PickupLibrary' );
t::lib::Mocks::mock_preference( 'LocalHoldsPriorityItemControl', 'homebranch' ); t::lib::Mocks::mock_preference( 'LocalHoldsPriorityItemControl', 'homebranch' );
my $branch = $builder->build_object( { class => 'Koha::Libraries' } ); 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(); Koha::Biblios->delete();
t::lib::Mocks::mock_preference( 'LocalHoldsPriority', 'GiveLibrary' ); 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( 'LocalHoldsPriorityPatronControl', 'PickupLibrary' );
t::lib::Mocks::mock_preference( 'LocalHoldsPriorityItemControl', 'homebranch' ); t::lib::Mocks::mock_preference( 'LocalHoldsPriorityItemControl', 'homebranch' );
my $branch = $builder->build_object( { class => 'Koha::Libraries' } ); my $branch = $builder->build_object( { class => 'Koha::Libraries' } );
@ -1519,7 +1519,7 @@ subtest 'Excludes from local holds priority' => sub {
Koha::Holds->delete; Koha::Holds->delete;
t::lib::Mocks::mock_preference( 'LocalHoldsPriority', 'GiveLibrary' ); 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( 'LocalHoldsPriorityPatronControl', 'PickupLibrary' );
t::lib::Mocks::mock_preference( 'LocalHoldsPriorityItemControl', 'homebranch' ); 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 # 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( '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( 'LocalHoldsPriorityPatronControl', 'HomeLibrary' );
t::lib::Mocks::mock_preference( 'LocalHoldsPriorityItemControl', 'homebranch' ); t::lib::Mocks::mock_preference( 'LocalHoldsPriorityItemControl', 'homebranch' );
t::lib::Mocks::mock_preference( 'LocalHoldsExclusivityPeriod', 7 ); t::lib::Mocks::mock_preference( 'LocalHoldsExclusivityPeriod', 7 );