From 9d4aec3a2ba772d37f12e793216feb428bc14c62 Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Tue, 21 Apr 2020 21:34:33 -0700 Subject: [PATCH] Bug 25235: Rename the button instead of alerting when replacing an existing record Test plan: Pre-patch 1 - Go to the main Authorities page, search for any authority, click the Actions menubutton and choose Edit 2 - Note the button saying Z39.50 search 3 - Note the modal alert forcing you to click it 4 - Cancel and cancel again, and in the New authority menubutton choose Default 5 - Click the button saying Z39.50 search again, note that it warns you about replacing your totally blank record Apply this patch 6 - Edit an existing authority, note the button says "Replace record via Z39.50/SRU search" 2 - Click the button, verify it still opens the search window with the main entry of the record filled in without an alert 3 - Create a new authority, note the button says "Z39.50/SRU search" 4 - Click the button, verify it still opens the search window but without an alert Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Martin Renvoize Signed-off-by: Joy Nelson --- .../prog/en/modules/authorities/authorities.tt | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 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 d49a8b9305..29b373dd35 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt @@ -11,7 +11,7 @@ $("#loading").hide(); }); var Sticky; - $(document).ready(function() { + $(document).ready(function() { var tabs = $('#authoritytabs').tabs(); $( "ul.sortable_field", tabs ).sortable(); $( "ul.sortable_subfield", tabs ).sortable(); @@ -26,15 +26,13 @@ } }); $("#z3950submit").click(function(){ - if (confirm(_("Please note that this Z39.50 search could replace the current record."))){ - var strQuery = GetZ3950Terms(); - if(strQuery){ - window.open("/cgi-bin/koha/cataloguing/z3950_auth_search.pl?authid=[% authid | html %]"+strQuery,"z3950search",'width=740,height=450,location=yes,toolbar=no,scrollbars=yes,resize=yes'); - } + var strQuery = GetZ3950Terms(); + if(strQuery){ + window.open("/cgi-bin/koha/cataloguing/z3950_auth_search.pl?authid=[% authid | html %]"+strQuery,"z3950search",'width=740,height=450,location=yes,toolbar=no,scrollbars=yes,resize=yes'); } return false; }); - }); + }); /** * check if z3950 mandatories are set or not @@ -216,7 +214,11 @@ function confirmnotdup(redirect){
- Z39.50 search + [% IF ( authid ) %] + Replace record via Z39.50/SRU search + [% ELSE %] + Z39.50/SRU search + [% END %]
[% IF ( authid ) %] -- 2.39.5