Bug 11879: (follow up) Some fixes and code cleanup

[srvgit] / opac / opac-suggestions.pl

diff --git a/opac/opac-suggestions.pl b/opac/opac-suggestions.pl
index 74e3079..b1f1701 100755 (executable)
--- a/opac/opac-suggestions.pl
+++ b/opac/opac-suggestions.pl
@@ -35,12 +35,13 @@ use Koha::Patrons;
 
 use Koha::DateUtils;
 
-my $input           = new CGI;
+my $input           = CGI->new;
 my $op              = $input->param('op') || 'else';
 my $biblionumber    = $input->param('biblionumber');
 my $suggestion      = $input->Vars;
 my $negcaptcha      = $input->param('negcap');
 my $suggested_by_anyone = $input->param('suggested_by_anyone') || 0;
+my $title_filter    = $input->param('title_filter');
 my $need_confirm    = 0;
 
 # If a spambot accidentally populates the 'negcap' field in the sugesstions form, then silently skip and return.
@@ -75,7 +76,6 @@ else {
             template_name   => "opac-suggestions.tt",
             query           => $input,
             type            => "opac",
-            authnotrequired => 0,
         }
     );
 }
@@ -189,7 +189,12 @@ if ( $op eq "add_confirm" ) {
     $op = 'else';
 }
 
-my $suggestions_loop = &SearchSuggestion({suggestedby => $suggestion->{suggestedby}});
+my $suggestions_loop = &SearchSuggestion(
+    {
+        suggestedby => $suggestion->{suggestedby},
+        title       => $title_filter,
+    }
+);
 if ( $op eq "delete_confirm" ) {
     my @delete_field = $input->multi_param("delete_field");
     foreach my $delete_field (@delete_field) {
@@ -218,21 +223,7 @@ foreach my $suggestion(@$suggestions_loop) {
     }
 }
 
-my $patron_reason_loop = GetAuthorisedValues("OPAC_SUG");
-
-# Is the person allowed to choose their branch
-if ( C4::Context->preference("AllowPurchaseSuggestionBranchChoice") ) {
-    my $branchcode = $input->param('branchcode') || q{};
-
-    if ( !$branchcode
-        && C4::Context->userenv
-        && C4::Context->userenv->{branch} )
-    {
-        $branchcode = C4::Context->userenv->{branch};
-    }
-
-    $template->param( branchcode => $branchcode );
-}
+my $patron_reason_loop = GetAuthorisedValues("OPAC_SUG", "opac");
 
 my @mandatoryfields;
 {
@@ -257,6 +248,16 @@ my @mandatoryfields;
     }
 }
 
+my @unwantedfields;
+{
+    last unless ($op eq 'add');
+    my $fldsreq_sp = C4::Context->preference("OPACSuggestionUnwantedFields");
+    @unwantedfields = sort split(/\s*\,\s*/, $fldsreq_sp);
+    foreach (@unwantedfields) {
+        $template->param( $_."_hidden" => 1);
+    }
+}
+
 $template->param(
     %$suggestion,
     suggestions_loop      => $suggestions_loop,
@@ -266,6 +267,7 @@ $template->param(
     messages              => \@messages,
     suggestionsview       => 1,
     suggested_by_anyone   => $suggested_by_anyone,
+    title_filter          => $title_filter,
     patrons_pending_suggestions_count => $patrons_pending_suggestions_count,
     need_confirm => $need_confirm,
     patrons_total_suggestions_count => $patrons_total_suggestions_count,