Bugzilla – Attachment 157726 Details for
Bug 34913
Upgrade DataTables from 1.10.18 to 1.13.6
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 34913: Adjust "Manage staged MARC records"
Bug-34913-Adjust-Manage-staged-MARC-records.patch (text/plain), 3.85 KB, created by
Jonathan Druart
on 2023-10-24 08:39:33 UTC
(
hide
)
Description:
Bug 34913: Adjust "Manage staged MARC records"
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2023-10-24 08:39:33 UTC
Size:
3.85 KB
patch
obsolete
>From 32fb5962a6467032516e582ec581a6b5d462feca Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Tue, 24 Oct 2023 10:32:07 +0200 >Subject: [PATCH] Bug 34913: Adjust "Manage staged MARC records" > >--- > .../en/modules/tools/manage-marc-import.tt | 22 +++++++------------ > tools/batch_records_ajax.pl | 19 ++++++++-------- > 2 files changed, 18 insertions(+), 23 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >index ee07bd8154b..f13fb9a8414 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >@@ -447,7 +447,14 @@ > "searching": false, > "processing": true, > "serverSide": true, >- "ajax": 'batch_records_ajax.pl', >+ ajax: { >+ url: "batch_records_ajax.pl", >+ type: "POST", >+ data: function ( d ) { >+ d.import_batch_id = [% import_batch_id | html %]; >+ return d; >+ }, >+ }, > "pagingType": "full_numbers", > "dom": '<"top pager"iflp>rt<"bottom pager"flp><"clear">', > "columns": [ >@@ -459,19 +466,6 @@ > { "data": null, "defaultContent": "" }, > { "data": "matched" } > ], >- "fnServerData": function(sSource, aoData, fnCallback) { >- aoData.push({ "name": "import_batch_id", "value": [% import_batch_id | html %] }); >- >- $.ajax({ >- 'dataType': 'json', >- 'type': 'POST', >- 'url': sSource, >- 'data': aoData, >- 'success': function(json) { >- fnCallback(json); >- } >- }); >- }, > "rowCallback": function(nRow, aData, iDisplayIndex, iDisplayIndexFull) { > [% IF(record_type == 'auth') %] > var record_details_url = "/cgi-bin/koha/authorities/detail.pl?authid="; >diff --git a/tools/batch_records_ajax.pl b/tools/batch_records_ajax.pl >index 3d706013ba4..29361094ac2 100755 >--- a/tools/batch_records_ajax.pl >+++ b/tools/batch_records_ajax.pl >@@ -44,10 +44,10 @@ my @sort_columns = > qw/import_record_id title status overlay_status overlay_status/; > > my $import_batch_id = $input->param('import_batch_id'); >-my $offset = $input->param('iDisplayStart'); >-my $results_per_page = $input->param('iDisplayLength'); >-my $sorting_column = $sort_columns[ $input->param('iSortCol_0') // 0 ]; >-my $sorting_direction = $input->param('sSortDir_0'); >+my $offset = $input->param('start'); >+my $results_per_page = $input->param('length'); >+my $sorting_column = $sort_columns[ $input->param('order[0][column]') // 0 ]; >+my $sorting_direction = $input->param('order[0][dir]'); > > $results_per_page = undef if $results_per_page && $results_per_page == -1; > >@@ -108,10 +108,11 @@ foreach my $record (@$records) { > }; > } > >-my $data; >-$data->{'iTotalRecords'} = $batch->{'num_records'}; >-$data->{'iTotalDisplayRecords'} = $batch->{'num_records'}; >-$data->{'sEcho'} = $input->param('sEcho') || undef; >-$data->{'aaData'} = \@list; >+my $data = { >+ recordsTotal => $batch->{num_records}, >+ recordsFiltered => $batch->{num_records}, >+ draw => $input->param('draw') || undef, >+ data => \@list, >+}; > > print to_json($data); >-- >2.34.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 34913
:
156480
|
157511
|
157725
|
157726
|
157729
|
158229
|
161575