Bugzilla – Attachment 150689 Details for
Bug 32478
Remove Koha::Config::SysPref->find since bypasses cache
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 32478: (follow-up) UpdateItemLocationOnCheckin no longer needs flattening
Bug-32478-follow-up-UpdateItemLocationOnCheckin-no.patch (text/plain), 2.33 KB, created by
Nick Clemens (kidclamp)
on 2023-05-04 18:40:25 UTC
(
hide
)
Description:
Bug 32478: (follow-up) UpdateItemLocationOnCheckin no longer needs flattening
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2023-05-04 18:40:25 UTC
Size:
2.33 KB
patch
obsolete
>From 4d5b01f7f4065c2454a58ea2c04e91fa7c08f62b Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Thu, 4 May 2023 18:37:53 +0000 >Subject: [PATCH] Bug 32478: (follow-up) UpdateItemLocationOnCheckin no longer > needs flattening > >This patch removes a line flattening the arrays generated by get_yaml_pref_hash >as it is no longer necessary > >Conditionals are adjusted to avoid warnings in tests > >Signed-off-by: Nick Clemens <nick@bywatersolutions.com> >--- > C4/Circulation.pm | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > >diff --git a/C4/Circulation.pm b/C4/Circulation.pm >index c27a465444..8c11aeadc6 100644 >--- a/C4/Circulation.pm >+++ b/C4/Circulation.pm >@@ -2138,7 +2138,6 @@ sub AddReturn { > my $patron_unblessed = $patron ? $patron->unblessed : {}; > > my $update_loc_rules = C4::Context->yaml_preference('UpdateItemLocationOnCheckin'); >- map { $update_loc_rules->{$_} = $update_loc_rules->{$_}[0] } keys %$update_loc_rules; #We can only move to one location so we flatten the arrays > if ($update_loc_rules) { > if (defined $update_loc_rules->{_ALL_}) { > if ($update_loc_rules->{_ALL_} eq '_PERM_') { $update_loc_rules->{_ALL_} = $item->permanent_location; } >@@ -2154,8 +2153,8 @@ sub AddReturn { > else { > foreach my $key ( keys %$update_loc_rules ) { > if ( $update_loc_rules->{$key} eq '_PERM_' ) { $update_loc_rules->{$key} = $item->permanent_location; } >- if ( $update_loc_rules->{$key} eq '_BLANK_') { $update_loc_rules->{$key} = '' ;} >- if ( ($item->location eq $key && $item->location ne $update_loc_rules->{$key}) || ($key eq '_BLANK_' && $item->location eq '' && $update_loc_rules->{$key} ne '') ) { >+ elsif ( $update_loc_rules->{$key} eq '_BLANK_') { $update_loc_rules->{$key} = '' ;} >+ if ( (defined $item->location && $item->location eq $key && $item->location ne $update_loc_rules->{$key}) || ($key eq '_BLANK_' && ( !defined $item->location || $item->location eq '' ) && $update_loc_rules->{$key} ne '') ) { > $messages->{'ItemLocationUpdated'} = { from => $item->location, to => $update_loc_rules->{$key} }; > $item->location($update_loc_rules->{$key})->store({ log_action => 0, skip_record_index => 1, skip_holds_queue => 1}); > last; >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 32478
:
144633
|
150685
|
150687
|
150688
|
150689
|
150690
|
151136
|
151726
|
151727
|
151728
|
151729
|
151730
|
151731
|
151732