From 33f53e4dfd79f122fac0d4daf3796ce163564580 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Mon, 24 Nov 2014 09:54:16 +0100
Subject: [PATCH] Bug 13329: Fix create a suggestion at the OPAC
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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.

I could reproduce the bug.
With patch bug is gone.

Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, thx for the quick fix.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
---
 .../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 d20b2b7646..46d00311f0 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 @@
                                         </li>
                                         [% IF ( branchloop ) %]
                                             <li><label for="branch">Library:</label>
-                                                <select name="branch" id="branch">
+                                                <select name="branchcode" id="branch">
                                                     [% FOREACH branchloo IN branchloop %]
                                                         [% IF ( branchloo.selected ) %]
                                                             <option value="[% branchloo.branchcode %]" selected="selected">[% branchloo.branchname %]</option>
diff --git a/opac/opac-suggestions.pl b/opac/opac-suggestions.pl
index d35f71526e..2d89d9367c 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.39.5