33f53e4dfd
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>
170 lines
5.4 KiB
Perl
Executable file
170 lines
5.4 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it under the
|
|
# terms of the GNU General Public License as published by the Free Software
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
|
# version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
|
|
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
|
|
# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License along
|
|
# with Koha; if not, write to the Free Software Foundation, Inc.,
|
|
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
use strict;
|
|
use warnings;
|
|
|
|
use CGI;
|
|
use C4::Auth; # get_template_and_user
|
|
use C4::Members;
|
|
use C4::Branch;
|
|
use C4::Koha;
|
|
use C4::Output;
|
|
use C4::Suggestions;
|
|
use C4::Koha;
|
|
use C4::Dates;
|
|
use C4::Scrubber;
|
|
|
|
use Koha::DateUtils qw( dt_from_string );
|
|
|
|
my $input = new CGI;
|
|
my $allsuggestions = $input->param('showall');
|
|
my $op = $input->param('op');
|
|
my $suggestion = $input->Vars;
|
|
delete $suggestion->{negcap};
|
|
my $negcaptcha = $input->param('negcap');
|
|
|
|
# If a spambot accidentally populates the 'negcap' field in the sugesstions form, then silently skip and return.
|
|
if ($negcaptcha ) {
|
|
print $input->redirect("/cgi-bin/koha/opac-suggestions.pl");
|
|
exit;
|
|
}
|
|
|
|
delete $$suggestion{$_} foreach qw<op suggestedbyme>;
|
|
$op = 'else' unless $op;
|
|
|
|
my ( $template, $borrowernumber, $cookie );
|
|
my $deleted = $input->param('deleted');
|
|
my $submitted = $input->param('submitted');
|
|
|
|
if ( C4::Context->preference("AnonSuggestions") ) {
|
|
( $template, $borrowernumber, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "opac-suggestions.tt",
|
|
query => $input,
|
|
type => "opac",
|
|
authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
|
|
}
|
|
);
|
|
if ( !$$suggestion{suggestedby} ) {
|
|
$$suggestion{suggestedby} = C4::Context->preference("AnonymousPatron");
|
|
}
|
|
}
|
|
else {
|
|
( $template, $borrowernumber, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "opac-suggestions.tt",
|
|
query => $input,
|
|
type => "opac",
|
|
authnotrequired => 0,
|
|
}
|
|
);
|
|
}
|
|
if ($allsuggestions){
|
|
delete $$suggestion{suggestedby};
|
|
}
|
|
else {
|
|
$$suggestion{suggestedby} ||= $borrowernumber unless ($allsuggestions);
|
|
}
|
|
# warn "bornum:",$borrowernumber;
|
|
|
|
my $suggestions_loop =
|
|
&SearchSuggestion( $suggestion);
|
|
if ( $op eq "add_confirm" ) {
|
|
if (@$suggestions_loop>=1){
|
|
#some suggestion are answering the request Donot Add
|
|
}
|
|
else {
|
|
my $scrubber = C4::Scrubber->new();
|
|
foreach my $suggest (keys %$suggestion){
|
|
$suggestion->{$suggest} = $scrubber->scrub($suggestion->{$suggest});
|
|
}
|
|
$suggestion->{suggesteddate} = dt_from_string;
|
|
$suggestion->{branchcode} = $input->param('branchcode') || C4::Context->userenv->{"branch"};
|
|
|
|
&NewSuggestion($suggestion);
|
|
# empty fields, to avoid filter in "SearchSuggestion"
|
|
$$suggestion{$_}='' foreach qw<title author publishercode copyrightdate place collectiontitle isbn STATUS>;
|
|
$suggestions_loop =
|
|
&SearchSuggestion( $suggestion );
|
|
}
|
|
$op = 'else';
|
|
print $input->redirect("/cgi-bin/koha/opac-suggestions.pl?op=else&submitted=1");
|
|
exit;
|
|
}
|
|
|
|
if ( $op eq "delete_confirm" ) {
|
|
my @delete_field = $input->param("delete_field");
|
|
foreach my $delete_field (@delete_field) {
|
|
&DelSuggestion( $borrowernumber, $delete_field );
|
|
}
|
|
$op = 'else';
|
|
print $input->redirect("/cgi-bin/koha/opac-suggestions.pl?op=else&deleted=1");
|
|
exit;
|
|
}
|
|
map{ $_->{'branchcodesuggestedby'}=GetBranchInfo($_->{'branchcodesuggestedby'})->[0]->{'branchname'}} @$suggestions_loop;
|
|
my $supportlist=GetSupportList();
|
|
foreach my $support(@$supportlist){
|
|
if ($$support{'imageurl'}){
|
|
$$support{'imageurl'}= getitemtypeimagelocation( 'opac', $$support{'imageurl'} );
|
|
}
|
|
else {
|
|
delete $$support{'imageurl'}
|
|
}
|
|
}
|
|
|
|
foreach my $suggestion(@$suggestions_loop) {
|
|
if($suggestion->{'suggestedby'} == $borrowernumber) {
|
|
$suggestion->{'showcheckbox'} = $borrowernumber;
|
|
} else {
|
|
$suggestion->{'showcheckbox'} = 0;
|
|
}
|
|
if($suggestion->{'patronreason'}){
|
|
$suggestion->{'patronreason'} = GetKohaAuthorisedValueLib("OPAC_SUG",$suggestion->{'patronreason'},1);
|
|
}
|
|
}
|
|
|
|
my $patron_reason_loop = GetAuthorisedValues("OPAC_SUG");
|
|
|
|
# Is the person allowed to choose their branch
|
|
if ( C4::Context->preference("AllowPurchaseSuggestionBranchChoice") ) {
|
|
my ( $borr ) = GetMemberDetails( $borrowernumber );
|
|
|
|
# pass the pickup branch along....
|
|
my $userbranch = '';
|
|
if (C4::Context->userenv && C4::Context->userenv->{'branch'}) {
|
|
$userbranch = C4::Context->userenv->{'branch'};
|
|
}
|
|
my $branchcode = $input->param('branchcode') || $borr->{'branchcode'} || $userbranch || '' ;
|
|
|
|
# make branch selection options...
|
|
my $branchloop = GetBranchesLoop($branchcode);
|
|
$template->param( branchloop => $branchloop );
|
|
}
|
|
|
|
$template->param(
|
|
%$suggestion,
|
|
itemtypeloop=> $supportlist,
|
|
suggestions_loop => $suggestions_loop,
|
|
patron_reason_loop => $patron_reason_loop,
|
|
showall => $allsuggestions,
|
|
"op_$op" => 1,
|
|
suggestionsview => 1,
|
|
);
|
|
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|
|
|