Bug 30933: Adjust pref description, include ListOwnerDesignated

[srvgit] / acqui / newordersuggestion.pl

diff --git a/acqui/newordersuggestion.pl b/acqui/newordersuggestion.pl
index 5493496..9d35ec4 100755 (executable)
--- a/acqui/newordersuggestion.pl
+++ b/acqui/newordersuggestion.pl
@@ -91,15 +91,15 @@ can be equal to
 use Modern::Perl;
 
 use CGI qw ( -utf8 );
-use C4::Auth;    # get_template_and_user
-use C4::Output;
-use C4::Suggestions;
-use C4::Biblio;
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_html_with_http_headers );
+use C4::Suggestions qw( ConnectSuggestionAndBiblio );
 use C4::Budgets;
 
 use Koha::Acquisition::Booksellers;
+use Koha::Suggestions;
 
-my $input = new CGI;
+my $input = CGI->new;
 
 # getting the CGI params
 my $basketno        = $input->param('basketno');
@@ -128,23 +128,22 @@ if ( $op eq 'connectDuplicate' ) {
     ConnectSuggestionAndBiblio( $suggestionid, $duplicateNumber );
 }
 
-# getting all suggestions.
-my $suggestions_loop = SearchSuggestion(
+my $suggestions = [ Koha::Suggestions->search_limited(
     {
-        author        => $author,
-        title         => $title,
-        publishercode => $publishercode,
-        STATUS        => 'ACCEPTED'
-    }
-);
+        ( $author        ? ( author        => $author )        : () ),
+        ( $title         ? ( title         => $title )         : () ),
+        ( $publishercode ? ( publishercode => $publishercode ) : () ),
+        STATUS => 'ACCEPTED'
+    },
+    { prefetch => ['managedby', 'suggestedby'] },
+)->as_list ];
 
 my $vendor = Koha::Acquisition::Booksellers->find( $booksellerid );
 $template->param(
-    suggestions_loop        => $suggestions_loop,
+    suggestions             => $suggestions,
     basketno                => $basketno,
     booksellerid              => $booksellerid,
     name                    => $vendor->name,
-    loggedinuser            => $borrowernumber,
     "op_$op"                => 1,
 );