From ffe000aea9835f6c6499fb5a4d6ec7137fbeb6bd Mon Sep 17 00:00:00 2001
From: Fridolin Somers <fridolin.somers@biblibre.com>
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 @@
 
    <form action="process_koc.pl" id="enqueuefile" method="post" enctype="multipart/form-data">
      <input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" />
-     <input type="hidden" name="runinbackground" id="runinbackground" value="" />
+     [% UNLESS is_psgi %]<input type="hidden" name="runinbackground" id="runinbackground" value="" />[% END %]
      <input type="hidden" name="completedJobID" id="completedJobID" value="" />
      <!-- <input type="submit" value="Apply directly" id="mainformsubmit" /> -->
      <!-- FIXME: Job freezes when submitted, disabling button as a temporary mitigation -->
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(){
 <form name="f" action="batchMod.pl" method="post">
      <input type="hidden" name="op" value="[% op %]" />
      <input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" />
-     <input type="hidden" name="runinbackground" id="runinbackground" value="" />
+     [% UNLESS is_psgi %]<input type="hidden" name="runinbackground" id="runinbackground" value="" />[% END %]
      <input type="hidden" name="completedJobID" id="completedJobID" value="" />
      <input type="hidden" name="src" id="src" value="[% src %]" />
      [% 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 @@
           <input type="hidden" name="op" value="modify" />
           <input type="hidden" name="recordtype" value="[% recordtype %]" />
           <input type="button" id="mainformsubmit" value="Modify selected records" class="button" />
-          <input type="hidden" name="runinbackground" id="runinbackground" value="" />
+          [% UNLESS is_psgi %]<input type="hidden" name="runinbackground" id="runinbackground" value="" />[% END %]
           <input type="hidden" name="completedJobID" id="completedJobID" value="" />
           <a class="cancel" href="/cgi-bin/koha/tools/batch_record_modification.pl">Cancel</a>
         </fieldset>
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 ) %]
   <form action="[% script_name %]" method="post" id="import_batch_form">
     <input type="hidden" name="op" value="commit-batch" />
-    <input type="hidden" name="runinbackground" value="" />
+    [% UNLESS is_psgi %]<input type="hidden" name="runinbackground" id="runinbackground" value="" />[% END %]
     <input type="hidden" name="completedJobID" value="" />
     <input type="hidden" name="import_batch_id" value="[% import_batch_id %]" />
     <fieldset class="action">
@@ -222,7 +222,7 @@
   [% IF ( can_revert ) %]
   <form action="[% script_name %]" method="post" id="revert_batch_form">
     <input type="hidden" name="op" value="revert-batch" />
-    <input type="hidden" name="runinbackground" value="" />
+    [% UNLESS is_psgi %]<input type="hidden" name="runinbackground" id="runinbackground" value="" />[% END %]
     <input type="hidden" name="completedJobID" value="" />
     <input type="hidden" name="import_batch_id" value="[% import_batch_id %]" />
     <fieldset class="action"><input type="submit" class="button" name="mainformsubmit" value="Undo import into catalog" /></fieldset>
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 @@
     <form method="post" id="processfile" action="[% SCRIPT_NAME %]" enctype="multipart/form-data">
 <fieldset class="rows">
         <input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" />
-        <input type="hidden" name="runinbackground" id="runinbackground" value="" />
+        [% UNLESS is_psgi %]<input type="hidden" name="runinbackground" id="runinbackground" value="" />[% END %]
         <input type="hidden" name="completedJobID" id="completedJobID" value="" />
 	<ol><li>
 		<label for="comments">Comments about this file: </label>
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 @@
     <form method="post" id="processfile" action="/cgi-bin/koha/tools/upload-cover-image.pl" enctype="multipart/form-data">
 <fieldset class="rows">
         <input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" />
-        <input type="hidden" name="runinbackground" id="runinbackground" value="" />
+        [% UNLESS is_psgi %]<input type="hidden" name="runinbackground" id="runinbackground" value="" />[% END %]
         <input type="hidden" name="completedJobID" id="completedJobID" value="" />
 	</fieldset>
   <fieldset class="rows">
-- 
2.7.4