Jonathan Druart
d533a92aa8
The C4::Suggestions::SearchSuggestion subroutine is badly written and can be replaced by calls to Koha::Suggestions->search. The hard part in this patch is suggestion.pl, the other occurrences have been replaced easily. Test plan: The idea is to test the whole suggestion workflow. 1. Create a suggestion on OPAC 2. Create a suggestion on the staff interface 3. Edit suggestions 4. Filter suggestions (use the different filters and "organize by" values) Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Bug 23991: Remove SearchSuggestion tests Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Bug 23991: (QA follow-up) Save some DB queries This patch makes the suggestion-related pages rely on array size instead of querying the DB each time they need to. In the case of suggestion/suggestion.pl it goes from 4 COUNT(*) to 1. To test, with KTD: 1. Run on the host machine: $ docker exec -ti koha_db_1 bash $ mysql -ppassword > SET GLOBAL general_log_file='/var/log/mysql/mycustom.log'; > SET GLOBAL log_output = 'FILE'; > SET GLOBAL general_log = 'ON'; > \q $ tail -f /var/log/mysql/mycustom.log | grep suggestions 2. Visit the different pages changed on this bug => SUCCESS: Some queries 3. Apply this patch 4. Repeat 2 => SUCCESS: Less queries! 5. Sign off :-D Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Bug 23991: Fix branchcode and budgetid filtering Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Bug 23991: Fix conflict with bug 28941 Well, this patchset fixed the security bug... Redoing on top of bug 28941 Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Bug 23991: (follow-up) Missing semicolon Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Bug 23991: Fix 'all' libraries Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Bug 23991: (follow-up) Add value to filter_archived Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
150 lines
3.7 KiB
Perl
Executable file
150 lines
3.7 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# Copyright 2006 Biblibre
|
|
# Parts Copyright 2011 PTFS Europe
|
|
#
|
|
# 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 3 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, see <http://www.gnu.org/licenses>.
|
|
|
|
=head1 NAME
|
|
|
|
newordersuggestion.pl
|
|
|
|
=head1 DESCRIPTION
|
|
|
|
this script allow to add an order from a existing suggestion.
|
|
The suggestion must have 'ACCEPTED' as status.
|
|
|
|
=head1 CGI PARAMETERS
|
|
|
|
=over 4
|
|
|
|
=item basketno
|
|
|
|
the number of this basket.
|
|
|
|
=item booksellerid
|
|
|
|
the bookseller who sells this record.
|
|
|
|
=item title
|
|
|
|
to filter on title when searching among ACCEPTED suggestion.
|
|
|
|
=item author
|
|
|
|
to filter on author when searching among ACCEPTED suggestion.
|
|
|
|
=item note
|
|
|
|
to filter on note when searching among ACCEPTED suggestion.
|
|
|
|
=item copyrightdate
|
|
|
|
=item publishercode
|
|
|
|
=item volumedesc
|
|
|
|
=item publicationyear
|
|
|
|
the publication year of this record.
|
|
|
|
=item place
|
|
|
|
=item isbn
|
|
|
|
the isbn of this suggestion.
|
|
|
|
=item duplicateNumber
|
|
|
|
is the biblionumber to put to the new suggestion.
|
|
|
|
=item suggestionid
|
|
|
|
the id of the suggestion to select.
|
|
|
|
=item op
|
|
|
|
can be equal to
|
|
* connectDuplicate :
|
|
then call to the function : ConnectSuggestionAndBiblio.
|
|
i.e set the biblionumber of this suggestion.
|
|
* else :
|
|
is the default value.
|
|
|
|
=back
|
|
|
|
=cut
|
|
|
|
use Modern::Perl;
|
|
|
|
use CGI qw ( -utf8 );
|
|
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 = CGI->new;
|
|
|
|
# getting the CGI params
|
|
my $basketno = $input->param('basketno');
|
|
my $booksellerid = $input->param('booksellerid');
|
|
my $author = $input->param('author');
|
|
my $title = $input->param('title');
|
|
my $publishercode = $input->param('publishercode');
|
|
my $op = $input->param('op');
|
|
my $suggestionid = $input->param('suggestionid');
|
|
my $duplicateNumber = $input->param('duplicateNumber');
|
|
my $uncertainprice = $input->param('uncertainprice');
|
|
|
|
$op = 'else' unless $op;
|
|
|
|
my $dbh = C4::Context->dbh;
|
|
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "acqui/newordersuggestion.tt",
|
|
type => "intranet",
|
|
query => $input,
|
|
flagsrequired => { acquisition => 'order_manage' },
|
|
}
|
|
);
|
|
|
|
if ( $op eq 'connectDuplicate' ) {
|
|
ConnectSuggestionAndBiblio( $suggestionid, $duplicateNumber );
|
|
}
|
|
|
|
my $suggestions = [ Koha::Suggestions->search_limited(
|
|
{
|
|
( $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 => $suggestions,
|
|
basketno => $basketno,
|
|
booksellerid => $booksellerid,
|
|
name => $vendor->name,
|
|
"op_$op" => 1,
|
|
);
|
|
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|