From 59005356359e0e8bca4315e3881838be726a463e Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 5 Jul 2019 17:28:06 +0000
Subject: [PATCH] Bug 23278: Reopen last panel upon "Save and continue" in
 notices

This patch modifies the Notices edit process so that if the user chooses
the "Save and continue" option the page reloads with the same panel open
which they were previously editing in.

To test, apply the patch and go to Tools -> Notices and Slips.

 - Open a notice for editing.
 - Expand one of the sections.
 - Choose "Save and continue" from the button menu in the toolbar.
   - When the page reloads, the section you expanded should be open
     again.
 - Test each section and test with no sections expanded.

Signed-off-by: Maryse Simard <maryse.simard@inlibro.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 2c600bf439173c8a7a8ecd41a6433cd1199de078)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit f558185c8fbf5b5740959c0ec06b2188d6b16f4a)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 .../intranet-tmpl/prog/en/modules/tools/letter.tt  |  1 +
 koha-tmpl/intranet-tmpl/prog/js/letter.js          | 14 +++++++++++++-
 tools/letter.pl                                    |  7 +++++--
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
index f70dddb7b1..e8b884e184 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
@@ -412,6 +412,7 @@
         [% IF code.search('DGST') %] <span class="overdue">Warning, this is a template for a Digest, as such, any references to branch data ( e.g. branches.branchname ) will refer to the borrower's home branch.</span> [% END %]
 
         <input type="hidden" id="redirect" name="redirect" value="" />
+        <input type="hidden" id="section" name="section" value="[% section | html %]" />
         <input type="hidden" name="searchfield" value="[% searchfield | html %]" />
     </form>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/js/letter.js b/koha-tmpl/intranet-tmpl/prog/js/letter.js
index 968b0d10a1..d5216eff02 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/letter.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/letter.js
@@ -130,7 +130,19 @@ $(document).ready(function() {
         }
     });
 
-    $( ".transport-types" ).accordion({ collapsible: true, active:false, animate: 200 });
+    $( ".transport-types" ).accordion({
+        collapsible: true,
+        active: parseInt( $("#section").val(), 10),
+        animate: 200,
+        activate: function() {
+            var active = $( ".transport-types" ).accordion( "option", "active" );
+            if( active === false ){
+                $("#section").val("");
+            } else {
+                $("#section").val( active );
+            }
+        }
+    });
 
     $(".insert").on("click",function(){
         var containerid = $(this).data("containerid");
diff --git a/tools/letter.pl b/tools/letter.pl
index f1a234bf40..a673fa96a9 100755
--- a/tools/letter.pl
+++ b/tools/letter.pl
@@ -66,7 +66,9 @@ my $code        = $input->param('code');
 my $module      = $input->param('module') || '';
 my $content     = $input->param('content');
 my $op          = $input->param('op') || '';
-my $redirect      = $input->param('redirect');
+my $redirect    = $input->param('redirect');
+my $section     = $input->param('section');
+
 my $dbh = C4::Context->dbh;
 
 our ( $template, $borrowernumber, $cookie, $staffflags ) = get_template_and_user(
@@ -90,13 +92,14 @@ $template->param(
 	script_name => $script_name,
   searchfield => $searchfield,
     branchcode => $branchcode,
+    section => $section,
 	action => $script_name
 );
 
 if ( $op eq 'add_validate' or $op eq 'copy_validate' ) {
     add_validate();
     if( $redirect eq "just_save" ){
-        print $input->redirect("/cgi-bin/koha/tools/letter.pl?op=add_form&branchcode=$branchcode&module=$module&code=$code&redirect=done");
+        print $input->redirect("/cgi-bin/koha/tools/letter.pl?op=add_form&branchcode=$branchcode&module=$module&code=$code&redirect=done&section=$section");
         exit;
     } else {
         $op = q{}; # we return to the default screen for the next operation
-- 
2.39.5