From 830508971a3ae69b8ac7123a2262c18453cb9484 Mon Sep 17 00:00:00 2001 From: Baptiste Wojtkowski Date: Thu, 13 Jun 2024 15:36:18 +0200 Subject: [PATCH] Bug 30493: Pending archived suggestions appear on intranet home page MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit If suggestions are archived before their status is changed to something other than "Pending", they still appear on the intranet home page and the acquisitions home page as suggestions to be managed. WITHOUT PATCH: 1. Go to Acquisitions > Suggestions 2. Click on New purchase suggestion 3. Fill in the form (title only is fine) 4. Click on Submit your suggestion 5. Go to the home page (click the Koha logo) --> Notice it says that there is 1 pending suggestion 6. Go to Acquisitions --> Notice it says that there is 1 pending suggestion 7. Go to Suggestions 8. Click on the up arrow to the right of the Edit button and choose Archive --> There are no more pending suggestions 9. Go to the home page (click the Koha logo) --> Notice it says that there is 1 pending suggestion 10. Go to Acquisitions --> Notice it says that there is 1 pending suggestion The search function was fetching suggestions without considering the "archived" field. I now pick only suggestion that are pending AND not archived. WITH PATCH: 9. Go to the home page (click the Koha logo) --> Notice it says that there is no pending suggestion 10. Go to Acquisitions --> Notice it says that there is no pending suggestion Signed-off-by: Lucas Gass Signed-off-by: Emily Lamancusa Signed-off-by: Katrin Fischer (cherry picked from commit e87f4cd550e60d7955551abf44f4dd9c1fd332d5) Signed-off-by: Lucas Gass (cherry picked from commit 5db98bbd65bc0498bbb916c148076b258e5135ad) Signed-off-by: Fridolin Somers Signed-off-by: wainuiwitikapark (cherry picked from commit 619db47e3fe3b590f85643840e49770acf2f7149) Signed-off-by: Frédéric Demians --- acqui/acqui-home.pl | 2 +- mainpage.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/acqui/acqui-home.pl b/acqui/acqui-home.pl index 05eb16bf06..ebc78fa9f0 100755 --- a/acqui/acqui-home.pl +++ b/acqui/acqui-home.pl @@ -53,7 +53,7 @@ if( C4::Context->only_my_library ){ my $local_pendingsuggestions_count = Koha::Suggestions->search({ status => "ASKED", branchcode => C4::Context->userenv()->{'branch'} })->count(); $template->param( suggestions_count => $local_pendingsuggestions_count ); } else { - my $pendingsuggestions = Koha::Suggestions->search({ status => "ASKED" }); + my $pendingsuggestions = Koha::Suggestions->search({ status => "ASKED", archived => 0 }); my $local_pendingsuggestions_count = $pendingsuggestions->search({ 'me.branchcode' => C4::Context->userenv()->{'branch'} })->count(); my $pendingsuggestions_count = $pendingsuggestions->count(); $template->param( diff --git a/mainpage.pl b/mainpage.pl index 50017c0d2b..212665d267 100755 --- a/mainpage.pl +++ b/mainpage.pl @@ -90,7 +90,7 @@ if( C4::Context->only_my_library ){ my $local_pendingsuggestions_count = Koha::Suggestions->search({ status => "ASKED", branchcode => C4::Context->userenv()->{'branch'} })->count(); $template->param( pendingsuggestions => $local_pendingsuggestions_count ); } else { - my $pendingsuggestions = Koha::Suggestions->search({ status => "ASKED" }); + my $pendingsuggestions = Koha::Suggestions->search({ status => "ASKED", archived => 0 }); my $local_pendingsuggestions_count = $pendingsuggestions->search({ 'me.branchcode' => C4::Context->userenv()->{'branch'} })->count(); my $pendingsuggestions_count = $pendingsuggestions->count(); $template->param( -- 2.39.5