From 0ef3df3dd01cb9b48886112291dc54eec6ddc7eb Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 22 Apr 2020 12:40:32 +0000
Subject: [PATCH] Bug 25235: (follow-up) Shorten label and apply to addbiblio
 too

This follow-up changes the new label from "Replace record via Z39.50/SRU
search" to the more button-friendly "Replace via Z39.50/SRU"

This patch also applies the same change to the basic MARC editor
interface.

To test, apply the patch and follow the previous test plan to confirm
the change on the authorities page.

Go to Cataloging and edit an existing record in the basic MARC editor.
You should see the "Replace via Z39.50/SRU" button, and clicking it
should trigger the Z39.50 search window without asking for confirmation.

Create a new record in the basic MARC editor. The button should be
labeled "Z39.50/SRU" search, and it should trigger the popup window
without asking for confirmation.
---
 .../prog/en/modules/authorities/authorities.tt        |  2 +-
 .../prog/en/modules/cataloguing/addbiblio.tt          | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
index 026f48560f..54ec55408f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
@@ -216,7 +216,7 @@ function confirmnotdup(redirect){
         <div class="btn-group"><a href="#" id="addauth" class="btn btn-default" accesskey="w"><i class="fa fa-save"></i> Save</a></div>
         <div class="btn-group">
             [% IF ( authid ) %]
-                <a class="btn btn-default" id="z3950submit" href="#"><i class="fa fa-search"></i> Replace record via Z39.50/SRU search</a>
+                <a class="btn btn-default" id="z3950submit" href="#"><i class="fa fa-search"></i> Replace via Z39.50/SRU</a>
             [% ELSE %]
                 <a class="btn btn-default" id="z3950submit" href="#"><i class="fa fa-search"></i> Z39.50/SRU search</a>
             [% END %]
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 4fda2747a9..ea3698abf0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
@@ -85,13 +85,7 @@
 
         [%# Only ask for a confirmation if it is an edit %]
         $("#z3950search").click(function(){
-            [% IF biblionumber %]
-                if (confirm(_("Please note that this external search could replace the current record."))){
-                    PopupZ3950();
-                }
-            [% ELSE %]
-                PopupZ3950();
-            [% END %]
+            PopupZ3950();
         });
 
         $("#saverecord").click(function(){
@@ -587,7 +581,16 @@
                     [% END # /IF CAN_user_editcatalogue_edit_items %]
 
                     [% UNLESS (circborrowernumber) %][%# Hide in fast cataloging %]
-                        <div class="btn-group"><a class="btn btn-default" href="#" id="z3950search"><i class="fa fa-search"></i> Z39.50/SRU search</a></div>
+                        <div class="btn-group">
+                            <a class="btn btn-default" href="#" id="z3950search">
+                                <i class="fa fa-search"></i>
+                                [% IF ( biblionumber ) %]
+                                    Replace via Z39.50/SRU
+                                [% ELSE %]
+                                    Z39.50/SRU search
+                                [% END %]
+                            </a>
+                        </div>
                     [% END %]
 
                     <div class="btn-group">
-- 
2.11.0