From 5e563d81aae7e2e38ecda8ce19381b023130118a Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 20 Feb 2018 14:19:31 +0000
Subject: [PATCH] Bug 19786: (follow-up) Correct js include path, popup window
 size

This follow-up adds the required KOHA_VERSION variable to two templates
where it was missing.

This patch also adds a 'window_size' parameter to a popup window
function so that self-closing windows like blinddetail-biblio-search.pl
can appear small and others at a reasonable size.

To test, apply the patch and clear your browser cache if
necessary.

- Confirm that the QA tools do not complain about missing KOHA_VERSION
  in auth_finder.tt and searchresultlist_auth.tt.

- Open a bibliographic record for editing in the basic editor using a
  framework in which a field is linked to authorities.
- Trigger the authority selection window for that field.
- Click the "Clear field" button at the top of the authority search
  pop-up window. Another smaller popup window should briefly appear, and
  then both windows should close.
- Trigger the authority selection window again.
- Click the "Create new authority" button. A new window should appear
  with the MARC authority editor. The window should be a usable size.

Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../prog/en/modules/authorities/auth_finder.tt       |  2 +-
 .../en/modules/authorities/searchresultlist-auth.tt  |  2 +-
 .../intranet-tmpl/prog/js/auth-finder-search.js      | 12 ++++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tt
index 7460ecc660..8a7459ca98 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tt
@@ -28,7 +28,7 @@
         var index = "[% index %]";
         var authtypecode = "[% authtypecode %]";
     </script>
-    <script type="text/javascript" src="[% interface %]/[% theme %]/js/auth-finder-search.js"></script>
+    <script type="text/javascript" src="[% interface %]/[% theme %]/js/auth-finder-search_[% KOHA_VERSION %].js"></script>
 [% END %]
 
 [% INCLUDE 'intranet-bottom.inc' popup_window = 1 %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt
index 7ba7b1bf8a..3b99d6e92d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt
@@ -100,7 +100,7 @@
         var index = "[% index %]";
         var authtypecode = "[% authtypecode %]";
     </script>
-    <script type="text/javascript" src="[% interface %]/[% theme %]/js/auth-finder-search.js"></script>
+    <script type="text/javascript" src="[% interface %]/[% theme %]/js/auth-finder-search_[% KOHA_VERSION %].js"></script>
     <script type="text/javascript">
 
         function jumpfull(page){
diff --git a/koha-tmpl/intranet-tmpl/prog/js/auth-finder-search.js b/koha-tmpl/intranet-tmpl/prog/js/auth-finder-search.js
index ab1d394e2f..2e853e281a 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/auth-finder-search.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/auth-finder-search.js
@@ -3,11 +3,11 @@
 $(document).ready(function(){
     $("#clear").on("click",function(e){
         e.preventDefault();
-        finderjumpfull('blinddetail-biblio-search.pl?authid=0&index=' + index );
+        finderjump('blinddetail-biblio-search.pl?authid=0&index=' + index );
     });
     $("#createnew").on("click",function(e){
         e.preventDefault();
-        finderjumpfull('authorities.pl?index=' + index + '&authtypecode=' + authtypecode );
+        finderjump('authorities.pl?index=' + index + '&authtypecode=' + authtypecode, 'full' );
     });
     // marclist
     $( "#value_any" ).autocomplete({
@@ -95,6 +95,10 @@ $(document).ready(function(){
     });
 });
 
-function finderjumpfull(page){
-    window.open(page,'','width=100,height=100,resizable=yes,toolbar=false,scrollbars=yes,top');
+function finderjump(page, full){
+    var window_size = '';
+    if( full != "full"){
+        window_size = 'width=100,height=100,';
+    }
+    window.open(page,'', window_size + 'resizable=yes,toolbar=false,scrollbars=yes,top');
 }
-- 
2.39.5