Merge pull request #123 from ebsco/publication-match-fix

Updates Publication Match Placard Script

Author: mmabrahamson

Koha/Plugin/EDS.pm

@@ -31,10 +31,10 @@ $PluginDir = $PluginDir.'/Koha/Plugin/EDS';
 
 ################# DO NOT TOUCH - CONTROLLED BY build.py
 our $MAJOR_VERSION = "21.11";
-our $SUB_VERSION = "002";
+our $SUB_VERSION = "003";
 our $VERSION = $MAJOR_VERSION . "" . $SUB_VERSION;
 our $SHA_ADD = "https://widgets.ebscohost.com/prod/api/koha/sha/1711.json";
-our $DATE_UPDATE = '2022-07-19';
+our $DATE_UPDATE = '2022-08-12';
 ######################################################
 
 ## Here is our metadata, some keys are required, some are optional

Koha/Plugin/EDS/admin/release_notes.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- DO NOT TOUCH THIS FILE - controlled by build.py -->
 <kohaplugin>
-	<latestversion>21.11.002</latestversion>
+	<latestversion>21.11.003</latestversion>
 	<download>https://github.com/ebsco/edsapi-koha-plugin</download>
-	<lastupdated>2022/07/19</lastupdated>
+	<lastupdated>2022/08/12</lastupdated>
 	<releasenotes>
-		<release version="21.11.002" date="2022/07/19">
-			<note id="1" author="mabrahamson@ebsco.com">Includes updated templates for download cart and sendbasket.</note>
+		<release version="21.11.003" date="2022/08/12">
+			<note id="1" author="mabrahamson@ebsco.com">Fixes issue with publication placard.</note>
 		</release>
 	</releasenotes>
 </kohaplugin>

Koha/Plugin/EDS/bootstrap/includes/eds-publicationexactmatch.inc

@@ -25,14 +25,14 @@ var ftLinks="";
 
 publicationExactMatchInc+='<h3><a target="_blank" href="[% publicationexactmatch.0.PublicationRecords.0.PLink %]">'+pubTitle+'</a></h3>';
 
-publicationExactMatchInc+='<form onsubmit="window.parent.SearchWithinPublication(jQuery(\'#search-within-publication\').val());return false;" class="form-search">\
+publicationExactMatchInc+='<form onsubmit="event.preventDefault();SearchWithinPublication(jQuery(\'#search-within-publication\').val());return false;" class="form-search">\
 		<div class="input-prepend input-append">\
 			<div class="btn-group">\
 				<button class="btn dropdown-toggle" data-toggle="dropdown">[% EDSLANG.eds_publicationexactmatch_INC_full_text_access %] <span class="caret"></span></button>\
 				'+ftLinks+'\
 			  </div>\
-		  <input type="text" class="input-xlarge" id="search-within-publication" placeholder="[% EDSLANG.eds_publicationexactmatch_INC_search_within %]">\
-		  <span class="add-on" style="cursor:pointer" onclick="window.parent.SearchWithinPublication(jQuery(\'#search-within-publication\').val());"><i class="icon-search"></i></span>\
+		  <input type="text" class="input-xlarge" id="search-within-publication" onkeypress="checkChar(event);" placeholder="[% EDSLANG.eds_publicationexactmatch_INC_search_within %]">\
+		  <button style="cursor:pointer" class="btn btn-sm btn-primary"  onclick="SearchWithinPublication(jQuery(\'#search-within-publication\').val());return false;" >Search</button>\
 		</div>\
 	</form>';
 
@@ -56,6 +56,18 @@ function SearchWithinPublication(searchinTerm){
   if (searchinTerm == ''){ searchinTerm = 'FT Y OR FT N'; }
   window.location.href='/plugin/Koha/Plugin/EDS/opac/eds-search.pl?q=Search?query-1=AND,:{'+searchinTerm+'}|action=addfacetfilter('+encodeURIComponent('[% publicationexactmatch.0.PublicationRecords.0.Header.ResourceType %]:'+'[% publicationexactmatch.0.PublicationRecords.0.RecordInfo.BibRecord.BibEntity.Titles.0.TitleFull %]'.toLowerCase())+')&default=1';
 }
- 
+ function checkChar(e) 
+{ 
+        var charCode;
+        if(e && e.which)
+        {
+            charCode = e.which;
+        }
+		console.log(charCode);
+        if (charCode == 13) 
+        {
+           SearchWithinPublication(jQuery('#search-within-publication').val());
+        }
+ }
  </script>
 [% END %]

Koha/Plugin/EDS/js/EDSScript.tt

@@ -41,7 +41,7 @@ edsConfig.pluginhttppath = "[% PLUGIN_HTTP_PATH %]";
 var searchBlockCount = 3;
 
 // DO NOT TOUCH - controlled by build.py
-var versionEDSKoha = "21.11002";
+var versionEDSKoha = "21.11003";
 ///////////////////////////////////////
 
 if (document.title == "") {

eds_plugin_21.11002.kpz eds_plugin_21.11003.kpzeds_plugin_21.11002.kpz renamed to eds_plugin_21.11003.kpz

@@ -1,10 +1,10 @@
 {
     "MajorVersion": "21.11",
-    "MinorVersion": "002",
+    "MinorVersion": "003",
     "ReleaseNotes": [
         {
             "author": "mabrahamson@ebsco.com",
-            "note": "Includes updated templates for download cart and sendbasket."
+            "note": "Fixes issue with publication placard."
         }
     ],
     "ShaAdd": "https://widgets.ebscohost.com/prod/api/koha/sha/1711.json"