Browse Source

Bug 5449: JSON malformed in Koha - Blocker with jQuery 1.4.x

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
3.6.x-rmaint/testing
Julian Maurice 12 years ago
committed by Chris Cormack
parent
commit
6e85ee6db0
  1. 2
      offline_circ/process_koc.pl
  2. 2
      test/progressbarsubmit.pl
  3. 4
      tools/background-job-progress.pl
  4. 2
      tools/batchMod.pl
  5. 2
      tools/manage-marc-import.pl
  6. 2
      tools/stage-marc-import.pl
  7. 4
      tools/upload-file-progress.pl
  8. 2
      tools/upload-file.pl

2
offline_circ/process_koc.pl

@ -92,7 +92,7 @@ if ($completedJobID) {
my $reply = CGI->new("");
print $reply->header(-type => 'text/html');
print "{ jobID: '$jobID' }";
print '{"jobID":"' . $jobID . '"}';
exit 0;
} elsif (defined $pid) {
# child

2
test/progressbarsubmit.pl

@ -72,7 +72,7 @@ if ($completedJobID) {
my $reply = CGI->new("");
print $reply->header(-type => 'text/html');
print "{ jobID: '$jobID' }";
print '{"jobID":"' . $jobID . '"}';
exit 0;
} elsif (defined $pid) {
# if we get here, we're a child that has detached

4
tools/background-job-progress.pl

@ -36,7 +36,7 @@ my ($auth_status, $sessionID) = check_cookie_auth($cookies{'CGISESSID'}->value,
if ($auth_status ne "ok") {
my $reply = CGI->new("");
print $reply->header(-type => 'text/html');
print "{ progress: 0 }";
print '{"progress":"0"}';
exit 0;
}
@ -54,4 +54,4 @@ if (defined $job) {
my $reply = CGI->new("");
print $reply->header(-type => 'text/html');
# response will be sent back as JSON
print "{ progress: $reported_progress, job_size: $job_size, job_status: '$job_status' }";
print '{"progress":"' . $reported_progress . '","job_size":"' . $job_size . '","job_status":"' . $job_status . '"}';

2
tools/batchMod.pl

@ -563,7 +563,7 @@ sub put_in_background {
my $reply = CGI->new("");
print $reply->header(-type => 'text/html');
print "{ jobID: '$jobID' }";
print '{"jobID":"' . $jobID . '"}';
exit 0;
} elsif (defined $pid) {
# child

2
tools/manage-marc-import.pl

@ -298,7 +298,7 @@ sub put_in_background {
my $reply = CGI->new("");
print $reply->header(-type => 'text/html');
print "{ jobID: '$jobID' }";
print '{"jobID":"' . $jobID . '"}';
exit 0;
} elsif (defined $pid) {
# child

2
tools/stage-marc-import.pl

@ -108,7 +108,7 @@ if ($completedJobID) {
my $reply = CGI->new("");
print $reply->header(-type => 'text/html');
print "{ jobID: '$jobID' }";
print '{"jobID":"' . $jobID . '"}';
exit 0;
} elsif (defined $pid) {
# child

4
tools/upload-file-progress.pl

@ -35,7 +35,7 @@ my ($auth_status, $sessionID) = check_cookie_auth($cookies{'CGISESSID'}->value,
if ($auth_status ne "ok") {
my $reply = CGI->new("");
print $reply->header(-type => 'text/html');
print "{ progress: 0 }";
print '{"progress":"0"}';
exit 0;
}
@ -44,4 +44,4 @@ my $reported_progress = C4::UploadedFile->upload_progress($sessionID);
my $reply = CGI->new("");
print $reply->header(-type => 'text/html');
# response will be sent back as JSON
print "{ progress: $reported_progress }";
print '{"progress":"' . $reported_progress . '"}';

2
tools/upload-file.pl

@ -80,5 +80,5 @@ sub send_reply {
my $reply = CGI->new("");
print $reply->header(-type => 'text/html');
# response will be sent back as JSON
print "{ status: '$upload_status', fileid: '$fileid' }";
print '{"status":"' . $upload_status . '","fileid":"' . $fileid . '"}';
}

Loading…
Cancel
Save