From da6f7fbb2a176a7194c122a3eeb8d5844fabbc86 Mon Sep 17 00:00:00 2001
From: Liz Rea <liz@catalyst.net.nz>
Date: Thu, 14 Mar 2013 11:35:23 +1300
Subject: [PATCH] Bug 7883 - Save and continue editing for cataloging

Patch reworked from Elliot Davis' original patch - but using bootstrap instead of YUI.

This patch adds the ability for catalogers to save and continue editing when adding new biblios.

To Test:

Select an existing item or create a new item in cataloging using your favorite framework.
Edit the bib
From the save menu in the dropdown, select the new option of "Save and continue editing"
If you are missing required fields you should still be prompted to fill them in before saving
Once all required fields are in place you should be allowed to save, and you will be redirected to tab 0.

The original patch claims to redirect to the original tab, but I never observed that behaviour from it - this patch merely takes what was in the original and makes it boostrap.

Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---
 cataloguing/addbiblio.pl                              | 11 +++++++----
 .../prog/en/modules/cataloguing/addbiblio.tt          |  7 +++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index 3314f1a02a..fdbacd4902 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -872,7 +872,7 @@ if ( $op eq "addbiblio" ) {
         else {
             ( $biblionumber, $oldbibitemnum ) = AddBiblio( $record, $frameworkcode );
         }
-        if ($redirect eq "items" || ($mode ne "popup" && !$is_a_modif && $redirect ne "view")){
+        if ($redirect eq "items" || ($mode ne "popup" && !$is_a_modif && $redirect ne "view" && $redirect ne "just_save")){
 	    if ($frameworkcode eq 'FA'){
 		print $input->redirect(
             '/cgi-bin/koha/cataloguing/additem.pl?'
@@ -893,7 +893,7 @@ if ( $op eq "addbiblio" ) {
 		exit;
 	    }
         }
-	elsif($is_a_modif || $redirect eq "view"){
+    elsif(($is_a_modif || $redirect eq "view") && $redirect ne "just_save"){
             my $defaultview = C4::Context->preference('IntranetBiblioDefaultView');
             my $views = { C4::Search::enabled_staff_search_views };
             if ($defaultview eq 'isbd' && $views->{can_view_ISBD}) {
@@ -907,8 +907,11 @@ if ( $op eq "addbiblio" ) {
             }
             exit;
 
-	}
-	else {
+    }
+    elsif ($redirect eq "just_save"){
+        print $input->redirect("/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=$biblionumber&framework=$frameworkcode");
+    }
+    else {
           $template->param(
             biblionumber => $biblionumber,
             done         =>1,
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
index 8d489d27e2..26f8fa7f09 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
@@ -53,6 +53,12 @@
             redirect("items");
             return false;
         });
+        $("#saveandcontinue").click(function(){
+            $(".btn-group").removeClass("open");
+            redirect("just_save");
+            return false;
+        });
+
 	});
 
 function redirect(dest){
@@ -364,6 +370,7 @@ function Changefwk(FwkList) {
                 <ul class="dropdown-menu">
                     <li><a id="saveandview" href="#">Save and view record</a></li>
                     <li><a id="saveanditems" href="#">Save and edit items</a></li>
+                    <li><a id="saveandcontinue" href="#">Save and continue editing</a></li>
                 </ul>
             </div>
         [% END %]
-- 
2.39.5