From e7b02117503195ba806bc38a9b2f12a5c738c949 Mon Sep 17 00:00:00 2001 From: Janusz Kaczmarek Date: Wed, 15 Mar 2023 20:25:53 +0100 Subject: [PATCH] Bug 33238: Fix bad suggestions query (Bug 29886 follow-up) With IndependentBranches Koha explodes with Error 500 when a non superlibrarian tries to add to basket from suggestions. In errorlog you would find "DBIx::Class::Storage::DBI::_dbh_execute(): DBI Exception: DBD::mysql::st execute failed: Column 'branchcode' in where clause is ambiguous". Test plan: ========== 1. Have a Koha instance with IndependentBranches, some accepted suggestions, and a vendor defined. 2. Be a non superlibrarian librarian with permissions to manage acquisitions. 3. Create a new basket and try to add an item to the basket "From a suggestion". 4. Koha would generate error 500. 5. Apply the patch. 6. Try to add an item to the basket "From a suggestion". 7. You should succeed. Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 68b2f29d483290d5dfd859dce9b9fe7a387f3ab1) Signed-off-by: Matt Blenkinsop (cherry picked from commit d4fb68703098f25bd587a8fdfc6cd5b4d884c4f9) Signed-off-by: Lucas Gass (cherry picked from commit f849dd313cde6dfdd03aba5652fb9429f093c901) Signed-off-by: Arthur Suzuki --- Koha/Suggestions.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Koha/Suggestions.pm b/Koha/Suggestions.pm index 9b1d266586..fe40715854 100644 --- a/Koha/Suggestions.pm +++ b/Koha/Suggestions.pm @@ -56,7 +56,7 @@ sub search_limited { # from other libraries) my $userenv = C4::Context->userenv; - $resultset = $self->search({ branchcode => $userenv->{branch} }) + $resultset = $self->search({ 'me.branchcode' => $userenv->{branch} }) if $userenv && $userenv->{branch}; } -- 2.39.5