Attachment 122632 Details for Bug 27170 – Bug 27170: Add support for new 'links' property

[patch] Bug 27170: Add support for new 'links' property

Bug-27170-Add-support-for-new-links-property.patch (text/plain), 3.87 KB, created by Martin Renvoize (ashimema) on 2021-07-07 08:32:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2021-07-07 08:32:51 UTC

Size: 3.87 KB

patch

obsolete

>From b690c5696fcb09afbf3fb15d68ffd14977071fae Mon Sep 17 00:00:00 2001
>From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
>Date: Tue, 8 Dec 2020 12:21:43 +0000
>Subject: [PATCH] Bug 27170: Add support for new 'links' property
>
>This commit adds support for the new 'links' property that will allow an
>availability plugin to return an array of links for a result. These
>links are parsed and appended to the title field of a results record.
>
>Signed-off-by: Holly Cooper <hc@interleaf.ie>
>Signed-off-by: Barry Cannon <bc@interleaf.ie>
>---
> .../intranet-tmpl/prog/js/ill-availability.js | 24 ++++++++++++++++---
> .../bootstrap/js/ill-availability.js          | 24 ++++++++++++++++---
> 2 files changed, 42 insertions(+), 6 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/ill-availability.js b/koha-tmpl/intranet-tmpl/prog/js/ill-availability.js
>index 289b934ffa..8515200063 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/ill-availability.js
>+++ b/koha-tmpl/intranet-tmpl/prog/js/ill-availability.js
>@@ -1,5 +1,16 @@
> $(document).ready(function() {
> 
>+    var getLinks = function(row) {
>+        if (row.links.length === 0) {
>+            return false;
>+        }
>+        return row.links.map(function(link) {
>+            return '<a href="' + link.url + '" target="_blank">' +
>+                link.text +
>+                '</a>';
>+        });
>+    };
>+
>     window.doSearch = function() {
>         // In case the source doesn't supply data required for DT to calculate
>         // pagination, we need to do it ourselves
>@@ -51,9 +62,16 @@ $(document).ready(function() {
>         // Here we store them
>         var renders = {
>             title: function(data, type, row) {
>-                return row.url ?
>-                    '<a href="'+row.url+'" target="_blank">'+row.title+'</a>' :
>-                    row.title;
>+                var links = getLinks(row);
>+                if (links) {
>+                    return row.title + ' - ' + links.join(', ');
>+                } else if (row.url) {
>+                    return '<a href="' + row.url  + '" target="_blank">' +
>+                        row.title +
>+                        '</a>';
>+                } else {
>+                    return row.title;
>+                }
>             },
>             source: function(data, type, row) {
>                 return row.opac_url ?
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/js/ill-availability.js b/koha-tmpl/opac-tmpl/bootstrap/js/ill-availability.js
>index 9c0be4c105..239a3bfecd 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/js/ill-availability.js
>+++ b/koha-tmpl/opac-tmpl/bootstrap/js/ill-availability.js
>@@ -1,5 +1,16 @@
> $(document).ready(function() {
> 
>+    var getLinks = function(row) {
>+        if (row.links.length === 0) {
>+            return false;
>+        }
>+        return row.links.map(function(link) {
>+            return '<a href="' + link.url + '" target="_blank">' +
>+                link.text +
>+                '</a>';
>+        });
>+    };
>+
>     window.doSearch = function() {
>         // In case the source doesn't supply data required for DT to calculate
>         // pagination, we need to do it ourselves
>@@ -51,9 +62,16 @@ $(document).ready(function() {
>         // Here we store them
>         var renders = {
>             title: function(data, type, row) {
>-                return row.url ?
>-                    '<a href="'+row.url+'" target="_blank">'+row.title+'</a>' :
>-                    row.title;
>+                var links = getLinks(row);
>+                if (links) {
>+                    return row.title + ' - ' + links.join(', ');
>+                } else if (row.url) {
>+                    return '<a href="' + row.url  + '" target="_blank">' +
>+                        row.title +
>+                        '</a>';
>+                } else {
>+                    return row.title;
>+                }
>             },
>             source: function(data, type, row) {
>                 return row.opac_url ?
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 27170: 114256 | 122112 | 122113 | 122114 | 122115 | 122117 | 122167 | 122168 | 122169 | 122632 | 122633 | 122634 | 123339 | 123340 | 123341