From 8f1237967f3f2d7d2e4e2455722938105e620079 Mon Sep 17 00:00:00 2001
From: Aleisha Amohia <aleishaamohia@hotmail.com>
Date: Thu, 7 Feb 2019 19:55:38 +0000
Subject: [PATCH] Bug 14367: (follow-up) Rebasing to make patch work on master

Run through test plan and confirm everything still works as expected.
---
 C4/Biblio.pm                                       |  3 +-
 cataloguing/addbiblio.pl                           |  2 +-
 .../prog/en/modules/cataloguing/addbiblio.tt       | 34 +++++++++++++++++-----
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index d387721..b5b47e0 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -301,10 +301,11 @@ sub ModBiblio {
     # update biblionumber and biblioitemnumber in MARC
     # FIXME - this is assuming a 1 to 1 relationship between
     # biblios and biblioitems
-    my $sth = $dbh->prepare("select biblioitems.biblioitemnumber, biblio_metadata.history from biblioitems, biblio_metadata where biblioitems.biblionumber=?");
+    my $sth = $dbh->prepare("SELECT biblioitems.biblioitemnumber, biblio_metadata.history FROM biblioitems INNER JOIN biblio_metadata ON biblioitems.biblionumber = biblio_metadata.biblionumber WHERE biblioitems.biblionumber=?");
     $sth->execute($biblionumber);
     my ($biblioitemnumber, $history) = $sth->fetchrow;
     $sth->finish();
+    warn($history);
     _koha_marc_update_bib_ids( $record, $frameworkcode, $biblionumber, $biblioitemnumber );
 
     # load the koha-table data object
diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index 8dfcce1..557b5e6 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -852,7 +852,7 @@ if ( $op eq "addbiblio" ) {
         else {
             ( $biblionumber, $oldbibitemnum ) = AddBiblio( $record, $frameworkcode );
         }
-        if ($redirect eq "items" || ($mode ne "popup" && !$is_a_modif && $redirect ne "view" && $redirect ne "just_save")){
+        if ($redirect eq "items" || (defined $mode && $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?'
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 282a733..43b97b1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
@@ -1,4 +1,5 @@
 [% USE raw %]
+[% USE KohaDates %]
 [% USE Asset %]
 [% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %]
@@ -18,13 +19,28 @@
     var Sticky;
 	 $(document).ready(function() {
 
-        $(".input_marceditor").click(function(this){
-            historyToggle($(this).attr('id') + '_history');
+        $(".input_marceditor").click(function(){
+            var tag = $(this).attr('id');
+            historyToggle(tag + '_history');
             return false;
         });
 
-        $(".tag_editor").click(function(this){
-            openAuth(this.parentNode.parentNode.getElementsByTagName('input')[1].id, $(this).attr('id'), 'biblio');
+        $(".tag_editor").click(function(){
+            var tag = $(this).attr('id');
+            openAuth(this.parentNode.parentNode.getElementsByTagName('input')[1].id, tag, 'biblio');
+            return false;
+        });
+
+        $(".buttonHistory").click(function(){
+            var tag = $(this).attr('id');
+            HistoryToggle(tag + '_history');
+            return false;
+        });
+
+        $(".hist_rollback").click(function(){
+            var tag = $(this).attr('data-tag');
+            var value = $(this).attr('data-history');
+            HistoryRollback(tag, value);
             return false;
         });
 
@@ -783,7 +799,7 @@ function Changefwk() {
 
                 [% IF ( subfield_loo.history ) %]
                 <span class="subfield_history">
-                    <a href="#" class="buttonHistory" onclick="HistoryToggle('[% mv.id %]_history'); return false;">
+                    <a href="#" class="buttonHistory" id="[%- mv.id -%]">
                         <img src="[% interface %]/[% theme %]/img/icon-history.png" alt="History" title="Display history for this field" />
                     </a>
                 </span>
@@ -791,9 +807,11 @@ function Changefwk() {
                 <table class="history_table" id="[%- mv.id -%]_history" name="[%- mv.name -%]_history">
                     <tr><th>Value</th><th>Date</th><th>User</th></tr>
                     [% FOREACH hist IN subfield_loo.history %]
-						<tr><td><a href="#" onclick="HistoryRollback('[% mv.id %]', '[% hist.data %]'); return false;">[% hist.data %]</a></td>
-                        <td>[% hist.datetime %]</td>
-                        <td>[% hist.title %] [% hist.firstname %] [% hist.surname %]</td></tr>
+                        <tr>
+                            <td><a href="#" data-tag='[%- mv.id -%]' data-history='[% hist.data %]' class='hist_rollback'>[% hist.data | html %]</a></td>
+                            <td>[% hist.datetime | $KohaDates with_hours = 1 %]</td>
+                            <td>[% hist.title | html %] [% hist.firstname | html %] [% hist.surname | html %]</td>
+                        </tr>
                     [% END %]
                 </table>
                 [% END %]
-- 
2.1.4