From ffe000aea9835f6c6499fb5a4d6ec7137fbeb6bd 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 b7f50e6..f5a6e22 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 @@ -54,7 +54,7 @@
- + [% 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 32577c8..91bb630 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 @@ -112,7 +112,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 a1d5d75..34ea401 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 @@ -191,7 +191,7 @@ - + [% 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 cff595a..0f59bf6 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 @@ -199,7 +199,7 @@ [% IF ( can_commit ) %] - + [% UNLESS is_psgi %][% END %]
@@ -222,7 +222,7 @@ [% 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 29a49a8..87e4937 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 @@ -91,7 +91,7 @@
- + [% 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 d5f7903..b000eaa 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 @@ -71,7 +71,7 @@
    - + [% UNLESS is_psgi %][% END %]
    -- 2.7.4