@@ -, +, @@ wrapper "data": "biblio.author:biblio.title:biblio.isbn" Bug 27353: Set X-Base-Total-Count header for REST API --- Koha/REST/V1/Acquisitions/Orders.pm | 20 +- acqui/finishreceive.pl | 2 +- acqui/parcel.pl | 20 -- .../prog/en/modules/acqui/orderreceive.tt | 2 +- .../prog/en/modules/acqui/parcel.tt | 251 ++---------------- koha-tmpl/intranet-tmpl/prog/js/datatables.js | 46 +++- 6 files changed, 68 insertions(+), 273 deletions(-) --- a/Koha/REST/V1/Acquisitions/Orders.pm +++ a/Koha/REST/V1/Acquisitions/Orders.pm @@ -143,19 +143,15 @@ sub list { # Perform search my $orders = $orders_rs->search( $filtered_params, $attributes ); + my $total = $orders_rs->search->count; - if ($orders->is_paged) { - $c->add_pagination_headers({ - total => $orders->pager->total_entries, - params => $args, - }); - } - else { - $c->add_pagination_headers({ - total => $orders->count, - params => $args, - }); - } + $c->add_pagination_headers( + { + total => ($orders->is_paged ? $orders->pager->total_entries : $orders->count), + base_total => $total, + params => $args, + } + ); return $c->render( status => 200, --- a/acqui/finishreceive.pl +++ a/acqui/finishreceive.pl @@ -190,4 +190,4 @@ if ($suggestion_id) { $suggestion->update( { reason => $reason } ) if $suggestion; } -print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid&sticky_filters=1"); +print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid"); --- a/acqui/parcel.pl +++ a/acqui/parcel.pl @@ -109,25 +109,6 @@ unless( $invoiceid and $invoice->{invoiceid} ) { exit; } -my $sticky_filters = $input->param('sticky_filters') || 0; - -if ($sticky_filters) { - my $search = $input->cookie("filter_parcel_summary"); - my $ean = $input->cookie("filter_parcel_ean"); - my $basketname = $input->cookie("filter_parcel_basketname"); - my $orderno = $input->cookie("filter_parcel_orderno"); - my $basketgroupname = $input->cookie("filter_parcel_basketgroupname"); - - $template->param( - summaryfilter => $search, - eanfilter => $ean, - basketfilter => $basketname, - orderfilter => $orderno, - basketgroupnamefilter => $basketgroupname, - ); -} - - my $booksellerid = $invoice->{booksellerid}; my $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid ); @@ -211,6 +192,5 @@ $template->param( total_tax_excluded => $total_tax_excluded, total_tax_included => $total_tax_included, subtotal_for_funds => $subtotal_for_funds, - sticky_filters => $sticky_filters, ); output_html_with_http_headers $input, $cookie, $template->output; --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -370,7 +370,7 @@
- Cancel + Cancel
[% ELSE %] This ordernumber does not exist. --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -105,9 +105,6 @@ Basket Basket group Order line - Title - Author - ISBN Summary More Replacement price @@ -118,24 +115,6 @@     - -
-
-
-   -   -   -
-   -
-
-
-   - -
-   -   - @@ -340,41 +319,6 @@
@@ -388,86 +332,8 @@