From e458851cb12dcd66308d68e3724c07a325ab1855 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 24 Nov 2014 09:54:16 +0100 Subject: [PATCH] Bug 13329: Fix create a suggestion at the OPAC The suggestion table does not contain a 'branch' column name. The script should pass 'branchcode' to C4::Suggestion::NewSuggestion. Test plan: 0/ Enable the AllowPurchaseSuggestionBranchChoice pref 1/ Create a suggestion at the OPAC should not raise a DBIx::Class error. --- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt | 2 +- opac/opac-suggestions.pl | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt index d20b2b7..46d0031 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt @@ -57,7 +57,7 @@ [% IF ( branchloop ) %]
  • - [% FOREACH branchloo IN branchloop %] [% IF ( branchloo.selected ) %] diff --git a/opac/opac-suggestions.pl b/opac/opac-suggestions.pl index d35f715..2d89d93 100755 --- a/opac/opac-suggestions.pl +++ b/opac/opac-suggestions.pl @@ -94,7 +94,7 @@ if ( $op eq "add_confirm" ) { $suggestion->{$suggest} = $scrubber->scrub($suggestion->{$suggest}); } $suggestion->{suggesteddate} = dt_from_string; - $$suggestion{'branchcode'}= $input->param('branch') || C4::Context->userenv->{"branch"}; + $suggestion->{branchcode} = $input->param('branchcode') || C4::Context->userenv->{"branch"}; &NewSuggestion($suggestion); # empty fields, to avoid filter in "SearchSuggestion" @@ -149,10 +149,10 @@ if ( C4::Context->preference("AllowPurchaseSuggestionBranchChoice") ) { if (C4::Context->userenv && C4::Context->userenv->{'branch'}) { $userbranch = C4::Context->userenv->{'branch'}; } - my $branch = $input->param('branch') || $borr->{'branchcode'} || $userbranch || '' ; + my $branchcode = $input->param('branchcode') || $borr->{'branchcode'} || $userbranch || '' ; # make branch selection options... - my $branchloop = GetBranchesLoop($branch); + my $branchloop = GetBranchesLoop($branchcode); $template->param( branchloop => $branchloop ); } -- 2.1.0