Skip to content

Commit 22831e8

Browse files
committed
Updates to allow custom links to work in guest access
1 parent 3e40fc4 commit 22831e8

8 files changed

Lines changed: 16 additions & 17 deletions

File tree

Koha/Plugin/EDS.pm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ $PluginDir = $PluginDir.'/Koha/Plugin/EDS';
3030

3131
################# DO NOT TOUCH - CONTROLLED BY build.py
3232
our $MAJOR_VERSION = "20.11";
33-
our $SUB_VERSION = "008";
33+
our $SUB_VERSION = "009";
3434
our $VERSION = $MAJOR_VERSION . "" . $SUB_VERSION;
3535
our $SHA_ADD = "https://widgets.ebscohost.com/prod/api/koha/sha/1711.json";
36-
our $DATE_UPDATE = '2021-06-14';
36+
our $DATE_UPDATE = '2021-08-02';
3737
######################################################
3838

3939
## Here is our metadata, some keys are required, some are optional
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- DO NOT TOUCH THIS FILE - controlled by build.py -->
33
<kohaplugin>
4-
<latestversion>20.11.008</latestversion>
4+
<latestversion>20.11.009</latestversion>
55
<download>https://github.com/ebsco/edsapi-koha-plugin</download>
6-
<lastupdated>2021/06/14</lastupdated>
6+
<lastupdated>2021/08/02</lastupdated>
77
<releasenotes>
8-
<release version="20.11.008" date="2021/06/14">
9-
<note id="1" author="agupta@ebsco.com">Addresses issues with Koha 20.11. Removed EDSScript.js file.</note>
10-
<note id="2" author="mabrahamson@ebsco.com">Updates issues with http API calls and links.</note>
8+
<release version="20.11.009" date="2021/08/02">
9+
<note id="1" author="mabrahamson@ebsco.com">Updates custom links to work offline.</note>
1110
</release>
1211
</releasenotes>
1312
</kohaplugin>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
[% EDSLANG.eds_detail_customlinks_INC_pdf_fulltext %]
2020
[% ELSIF DETAILED_RECORD.FullText.Links.0.Type=='ebook-pdf' %]
2121
[% EDSLANG.eds_detail_customlinks_INC_ebook_fulltext %]
22-
[% ELSE %]
22+
[% ELSIF DETAILED_RECORD.FullText.Links.0.Type=='other' %]
23+
[% EDSLANG.eds_detail_customlinks_INC_other %]
24+
[% ELSE %]
2325
[% DETAILED_RECORD.FullText.Links.0.Type %]
2426
[% END %]
2527
</a></li>

Koha/Plugin/EDS/bootstrap/includes/lang/default.inc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
eds_results_TT_links_html = 'HTML Full Text'
1111
eds_results_TT_links_pdf = 'PDF Full Text'
1212
eds_results_TT_links_ebook = 'eBook Full Text'
13+
eds_results_TT_links_other = 'Linked Full Text'
1314
eds_results_TT_actions = 'Actions:'
1415
eds_results_TT_place_reserve = 'Place reserve'
1516
eds_results_TT_save_to_list = 'Save to Lists'
@@ -31,6 +32,7 @@
3132
eds_detail_customlinks_INC_pdf_fulltext = 'PDF Full Text'
3233
eds_detail_customlinks_INC_ebook_fulltext = 'eBook Full Text'
3334
eds_detail_customlinks_INC_view_in_eds = 'View in EDS'
35+
eds_detail_customlinks_INC_other = 'Linked Full Text'
3436
3537
eds_detail_sidebar_INC_print = 'Print'
3638
eds_detail_sidebar_INC_in_cart = 'In your cart'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@
305305
[% END %]
306306
[% FOREACH CUSTOMLINK IN RECORD.FullText.Links %]
307307

308-
<a class="[% CUSTOMLINK.Type %]" target="_blank" href="eds-detail.pl?q=Retrieve?an=[% ResultRecordId %]|dbid=[%RECORD.Header.DbId%]&fulltext=[% CUSTOMLINK.Type %]" title="[% CUSTOMLINK.MouseOverText %]" style="height: 16px; display: inline-block;">
308+
<a class="[% CUSTOMLINK.Type %]" target="_blank" href="eds-detail.pl?q=Retrieve?an=[% RECORD.Header.An %]|dbid=[%RECORD.Header.DbId%]&fulltext=[% CUSTOMLINK.Type %]" title="[% CUSTOMLINK.MouseOverText %]" style="height: 16px; display: inline-block;">
309309
[% IF CUSTOMLINK.Type == 'pdflink' %][% EDSLANG.eds_results_TT_links_pdf %]
310310
[% ELSIF CUSTOMLINK.Type == 'ebook-pdf' %][% EDSLANG.eds_results_TT_links_ebook %]
311311
[% ELSE %][% CUSTOMLINK.Type %][% END %]

Koha/Plugin/EDS/js/EDSScript.tt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ edsConfig.edsprofileid = "[% edsprofileid %]";
4040
var searchBlockCount = 3;
4141

4242
// DO NOT TOUCH - controlled by build.py
43-
var versionEDSKoha = "20.11008";
43+
var versionEDSKoha = "20.11009";
4444
///////////////////////////////////////
4545

4646
if (document.title == "") {
@@ -235,7 +235,7 @@ function StartEDS(edsLang) {
235235

236236

237237
if ($.cookie("guest") == 'y') {
238-
jQuery('.results_summary.actions.links a, #opac-detail a.pdflink').each(function () {
238+
jQuery('a.pdflink, a.html-customlink, a.other').each(function () {
239239
jQuery(this).attr('href', 'javascript:LoginRequired()');
240240
jQuery(this).attr('target', '_self');
241241
});

version.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
{
22
"MajorVersion": "20.11",
3-
"MinorVersion": "008",
3+
"MinorVersion": "009",
44
"ReleaseNotes": [
5-
{
6-
"author": "agupta@ebsco.com",
7-
"note": "Addresses issues with Koha 20.11. Removed EDSScript.js file."
8-
},
95
{
106
"author": "mabrahamson@ebsco.com",
11-
"note": "Updates issues with http API calls and links."
7+
"note": "Updates custom links to work offline."
128
}
139
],
1410
"ShaAdd": "https://widgets.ebscohost.com/prod/api/koha/sha/1711.json"

0 commit comments

Comments
 (0)