From 8f12c8e4fb90497686f53e831cd7781100beb972 Mon Sep 17 00:00:00 2001 From: Fridolin Somers Date: Fri, 2 Sep 2016 12:57:31 +0200 Subject: [PATCH] Bug 17240 - Allow processes that rely on background jobs run in Plack mode Since Plack mode (PSGI), the processes running with background jobs are broken. Bug 15218 corrected by using CGI mode for concerned pages. This patch proposes to allow running those pages in PSGI mode by disabling background jobs when PSGI is used. Script are running so faster with Plack, there are less chances that the process will end in HTTP timeout. Test plan : - on a Koha running with plack - revert Bug 15218 changes - test processes on pages : offline_circ/process_koc.pl tools/batchMod-edit.pl tools/batch_record_modification.pl tools/manage-marc-import.pl tools/stage-marc-import.pl tools/upload-images.pl --- koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt index 01275e0..87effd9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt @@ -116,7 +116,7 @@ function CheckForm(f) {
- + [% UNLESS is_psgi %][% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt index 7432604..0de08e7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt @@ -101,7 +101,7 @@ $(document).ready(function(){ - + [% UNLESS is_psgi %][% END %] [% IF biblionumber %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt index 2d7d534..a695b68 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt @@ -247,7 +247,7 @@ $(document).ready(function() { - + [% UNLESS is_psgi %][% END %] Cancel 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 a8a9572..44d293a 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 @@ -341,7 +341,7 @@ $(document).ready(function(){ [% IF ( can_commit ) %] - + [% UNLESS is_psgi %][% END %]
@@ -364,7 +364,7 @@ $(document).ready(function(){ [% IF ( can_revert ) %] - + [% UNLESS is_psgi %][% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt index 45aeac9..36553c3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt @@ -164,7 +164,7 @@ function cbUpload( status, fileid ) {
- + [% UNLESS is_psgi %][% END %]
  1. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt index a1300fc..e570b04 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt @@ -114,7 +114,7 @@ $(document).ready(function(){
    - + [% UNLESS is_psgi %][% END %]
    -- 2.7.4