Merge pull request #109 from ebsco/koha-2105-updates

Updates for 21.05

Author: mmabrahamson

Koha/Plugin/EDS.pm

@@ -29,11 +29,11 @@ my ($PluginDir) = grep { -f $_ . "/Koha/Plugin/EDS.pm" } @pluginsdir;
 $PluginDir = $PluginDir.'/Koha/Plugin/EDS';
 
 ################# DO NOT TOUCH - CONTROLLED BY build.py
-our $MAJOR_VERSION = "20.11";
-our $SUB_VERSION = "009";
+our $MAJOR_VERSION = "21.05";
+our $SUB_VERSION = "001";
 our $VERSION = $MAJOR_VERSION . "" . $SUB_VERSION;
 our $SHA_ADD = "https://widgets.ebscohost.com/prod/api/koha/sha/1711.json";
-our $DATE_UPDATE = '2021-08-02';
+our $DATE_UPDATE = '2021-08-17';
 ######################################################
 
 ## Here is our metadata, some keys are required, some are optional
@@ -110,6 +110,7 @@ sub configure {
 			defaultparams	    => $self->retrieve_data('defaultparams'),
 			autocomplete_mode	=> $self->retrieve_data('autocomplete_mode'),
 			autocomplete	    => $self->retrieve_data('autocomplete'),
+			PLUGIN_HTTP_PATH	=> $self->get_plugin_http_path(),
 
 
         );
@@ -175,7 +176,8 @@ sub update_EDSScript_js {
 		autocomplete		=> ($cgi->param('autocomplete')?$cgi->param('autocomplete'):"-"),
 		authtoken 			=> $cgi->param('authtoken'),
 		lastedsinfoupdate	=> $cgi->param('lastedsinfoupdate'),
-		edsinfo 			=> quotemeta($self->retrieve_data('edsinfo'))
+		edsinfo 			=> quotemeta($self->retrieve_data('edsinfo')),
+		PLUGIN_HTTP_PATH 	=> $self->get_plugin_http_path(),
 	};
     #my $pluginsdir = C4::Context->config('pluginsdir');
     #my @pluginsdir = ref($pluginsdir) eq 'ARRAY' ? @$pluginsdir : $pluginsdir;
@@ -185,8 +187,9 @@ sub update_EDSScript_js {
     #        push @plugindirs, $plugindir
     #}
     my $template = Template->new({
-		INCLUDE_PATH => $PluginDir,
-		OUTPUT_PATH => $PluginDir
+		INCLUDE_PATH 		=> $PluginDir,
+		OUTPUT_PATH 		=> $PluginDir,
+		PLUGIN_HTTP_PATH 	=> $self->get_plugin_http_path(),
     });
 	$template->process('js/EDSScript.tt',$vars, 'js/EDSScript.js');
 	$template->process('opac/templates/eds-methods.tt',$vars, 'opac/eds-methods.pl');
@@ -244,7 +247,7 @@ sub opac_js {
     <script>
     var defaultSearch="| . $default_search . q|";
     </script>
-    <script src="/plugin/Koha/Plugin/EDS/js/EDSScript.js">
+    <script src="|. $self->get_plugin_http_path() . q|/js/EDSScript.js">
     </script>
     |;
 }
@@ -372,6 +375,7 @@ sub SetupTool {
 			customjs			=>\@customJSContent,
 			jsstate				=>$customJS,
 			plugin_dir			=>$PluginDir,
+			PLUGIN_HTTP_PATH 	=> $self->get_plugin_http_path(),
 
         );
 

Koha/Plugin/EDS/admin/configure.tt

@@ -234,15 +234,15 @@ function EDSUpdateInfo(){
 	$('#updateInfoBtn').val('Loading - this page will refresh in 10 seconds. Please wait...');
 	$('#updateInfoBtn').attr('disabled','disabled');
 
-	var updateURL = '[% OPACBaseURL %]/plugin/Koha/Plugin/EDS/opac/eds-raw.pl?q=info';
+	var updateURL = '[% OPACBaseURL %][% PLUGIN_HTTP_PATH %]/opac/eds-raw.pl?q=info';
 	console.log(updateURL);
 	var infoUpdateWindow=window.open(updateURL,'infoUpdateWindow',"width=100, height=10, top=0, left=0");
 	setTimeout(function(){location.reload();},10000);
 
 }
 
 function GetLocalIP(){
-	window.open('[% OPACBaseURL %]/plugin/Koha/Plugin/EDS/opac/eds-raw.pl?q=getip','getLocalIP',"width=100, height=10, top=0, left=0");
+	window.open('[% OPACBaseURL %][% PLUGIN_HTTP_PATH %]/opac/eds-raw.pl?q=getip','getLocalIP',"width=100, height=10, top=0, left=0");
 }
 
 </script>

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>20.11.009</latestversion>
+	<latestversion>21.05.001</latestversion>
 	<download>https://github.com/ebsco/edsapi-koha-plugin</download>
-	<lastupdated>2021/08/02</lastupdated>
+	<lastupdated>2021/08/17</lastupdated>
 	<releasenotes>
-		<release version="20.11.009" date="2021/08/02">
-			<note id="1" author="mabrahamson@ebsco.com">Updates custom links to work offline.</note>
+		<release version="21.05.001" date="2021/08/17">
+			<note id="1" author="mabrahamson@ebsco.com">Compatibility updates for 21.05.</note>
 		</release>
 	</releasenotes>
 </kohaplugin>

Koha/Plugin/EDS/bootstrap/modules/eds-advsearch.tt

@@ -267,7 +267,7 @@
                 <fieldset class="action">
                     <p>
                         <input class="btn btn-primary advSB" type="submit" accesskey="s" name="do" title="Search" value="Search">
-                        <a href="/plugin/Koha/Plugin/EDS/opac/eds-search.pl" class="btn btn-default new-search">New search</a>
+                        <a href="[% PLUGIN_HTTP_PATH %]/opac/eds-search.pl" class="btn btn-default new-search">New search</a>
                     </p>
                 </fieldset>
                 <!-- /SEARCH BUTTONS -->

Koha/Plugin/EDS/bootstrap/modules/eds-results.tt

@@ -257,7 +257,7 @@
 							[% BREAK %]
 						[% END %]
 					[% ELSE %]
-						<a class="title" href="/plugin/Koha/Plugin/EDS/opac/eds-detail.pl?q=Retrieve?an=[% RECORD.Header.An %]|dbid=[%RECORD.Header.DbId%]&resultid=[% RECORD.ResultId %]" title="[% EDSLANG.eds_results_TT_title_attr %]">[% ITEM.Data %]</a>
+						<a class="title" href="[% PLUGIN_HTTP_PATH %]/opac/eds-detail.pl?q=Retrieve?an=[% RECORD.Header.An %]|dbid=[%RECORD.Header.DbId%]&resultid=[% RECORD.ResultId %]" title="[% EDSLANG.eds_results_TT_title_attr %]">[% ITEM.Data %]</a>
 					[% END %]
 				</div>
 				[% #IMAGE START %]

Koha/Plugin/EDS/bootstrap/modules/pfi-results.tt

@@ -218,7 +218,7 @@
 							[% BREAK %]
 						[% END %]
 					[% ELSE %]	
-						<a class="title" href="/plugin/Koha/Plugin/EDS/opac/eds-detail.pl?q=Retrieve?id=[% RECORD.Header.PublicationId %]|dbid=edspub&resultid=[% RECORD.ResultId %]" title="[% EDSLANG.eds_results_TT_title_attr %]">[% ITEM.Data %]</a>
+						<a class="title" href="[% PLUGIN_HTTP_PATH %]/opac/eds-detail.pl?q=Retrieve?id=[% RECORD.Header.PublicationId %]|dbid=edspub&resultid=[% RECORD.ResultId %]" title="[% EDSLANG.eds_results_TT_title_attr %]">[% ITEM.Data %]</a>
 					[% END %]	
 				</div>	
 				[% #IMAGE START %]