gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 36084: Fix file upload and www/batch.t 

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Jonathan Druart 2024-02-28 10:01:25 +01:00
parent e19c978f02
commit 6323e08ed7
No known key found for this signature in database
GPG Key ID: A085E712BEF0E0F0
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
koha-tmpl/intranet-tmpl/prog/js/file-upload.js
View File

@ -5,6 +5,7 @@ function AjaxUpload ( input, progressbar, xtra, callback ) {
$.each( input.prop('files'), function( dx, file ) {
formData.append( "uploadfile", file );
});
formData.append( "csrf_token", $('meta[name="csrf-token"]').attr('content') );
var xhr= new XMLHttpRequest();
var url= '/cgi-bin/koha/tools/upload-file.pl?' + xtra;
progressbar.val( 0 );

4
t/db_dependent/www/batch.t
View File

@ -79,8 +79,8 @@ else {
my $agent = Test::WWW::Mechanize->new( autocheck => 1 );
$agent->get_ok( "$intranet/cgi-bin/koha/mainpage.pl", 'connect to intranet' );
$agent->form_name('loginform');
$agent->field( 'password', $password );
$agent->field( 'userid', $user );
$agent->field( 'login_password', $password );
$agent->field( 'login_userid', $user );
$agent->field( 'branch', '' );
$agent->click_ok( '', 'login to staff interface' );

15
t/lib/Mocks/Zebra.pm
View File

@ -23,6 +23,7 @@ use File::Path qw( rmtree );
use JSON qw( decode_json );
use C4::ImportBatch;
use Koha::BackgroundJobs;
use Koha::Token;
=head1 NAME
@ -130,8 +131,8 @@ sub load_records_ui {
our $agent = Test::WWW::Mechanize->new( autocheck => 1 );
$agent->get_ok( "$cgi_root/mainpage.pl", 'connect to intranet' );
$agent->form_name('loginform');
$agent->field( 'userid', $ENV{KOHA_PASS} );
$agent->field( 'password', $ENV{KOHA_USER} );
$agent->field( 'login_userid', $ENV{KOHA_PASS} );
$agent->field( 'login_password', $ENV{KOHA_USER} );
$agent->field( 'branch', '' );
$agent->click_ok( '', 'login to staff interface' );
@ -141,9 +142,11 @@ sub load_records_ui {
$agent->follow_link_ok( { text => 'Stage records for import' },
'go to stage MARC' );
my $session_id = $agent->cookie_jar->get_cookies('koha.local')->{CGISESSID};
my $csrf_token = Koha::Token->new->generate_csrf({session_id => $session_id});
$agent->post(
"$cgi_root/tools/upload-file.pl?temp=1",
[ 'fileToUpload' => [$file], ],
[ 'fileToUpload' => [$file], csrf_token => $csrf_token ],
'Content_Type' => 'form-data',
);
ok( $agent->success, 'uploaded file' );
@ -156,7 +159,7 @@ sub load_records_ui {
'reopen stage MARC page' );
$agent->submit_form_ok(
{
form_number => 5,
form_id => 'processfile',
fields => {
'uploadedfileid' => $fileid,
'nomatch_action' => 'create_new',
@ -166,7 +169,9 @@ sub load_records_ui {
'comments' => '',
'encoding' => 'utf8',
'parse_items' => '1',
'record_type' => 'biblio'
'record_type' => 'biblio',
op => 'cud-stage',
csrf_token => $csrf_token, # TODO May need to retrieve another token if we invalid them at some point
}
},
'stage MARC'