Attachment 166567 Details for Bug 33737 – Bug 33737: Link from patron bookings to biblio bookings

[patch] Bug 33737: Link from patron bookings to biblio bookings

Bug-33737-Link-from-patron-bookings-to-biblio-book.patch (text/plain), 4.48 KB, created by Martin Renvoize (ashimema) on 2024-05-10 14:15:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2024-05-10 14:15:56 UTC

Size: 4.48 KB

patch

obsolete

>From 3a751f0edf082e596a5e85c01a10be3d6d399de3 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Fri, 18 Aug 2023 11:38:53 +0100
>Subject: [PATCH] Bug 33737: Link from patron bookings to biblio bookings
>
>Signed-off-by: Esther Melander <esther@bywatersolutions.com>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> .../prog/en/includes/js-biblio-format.inc          |  2 ++
> .../prog/en/modules/members/moremember.tt          | 14 ++++++++++----
> 2 files changed, 12 insertions(+), 4 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/js-biblio-format.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/js-biblio-format.inc
>index 498a7a44e98..9d31b778c3c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/js-biblio-format.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/js-biblio-format.inc
>@@ -41,6 +41,8 @@
>                     title = '<a href="/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=' + encodeURIComponent(biblio.biblio_id) + '" class="title">' + title + '</a>';
>                 } else if (config.link === 'isbd') {
>                     title = '<a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=' + encodeURIComponent(biblio.biblio_id) + '" class="title">' + title + '</a>';
>+                } else if (config.link === 'bookings') {
>+                    title = '<a href="/cgi-bin/koha/bookings/list.pl?biblionumber=' + encodeURIComponent(biblio.biblio_id) + '" class="title">' + title + '</a>';
>                 } else {
>                     title = '<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=' + encodeURIComponent(biblio.biblio_id) + '" class="title">' + title + '</a>';
>                 }
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>index 71d2991a93f..e468079c1e5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>@@ -747,8 +747,8 @@
>     [% END %]
>     [% Asset.js("js/holds.js") | $raw %]
>     [% INCLUDE 'calendar.inc' %]
>-    [% Asset.js("js/bookings.js") | $raw %]
>     [% Asset.js("js/cancel_booking_modal.js") | $raw %]
>+    [% INCLUDE 'js-biblio-format.inc' %]
>     [% INCLUDE 'str/members-menu.inc' %]
>     [% Asset.js("js/members-menu.js") | $raw %]
>     [% Asset.js("js/recalls.js") | $raw %]
>@@ -804,7 +804,9 @@
>                             "searchable": true,
>                             "orderable": true,
>                             "render": function(data,type,row,meta) {
>-                                return row.biblio.title;
>+                                return $biblio_to_html(row.biblio, {
>+                                    link: 'bookings'
>+                                });
>                             }
>                         },
>                         {
>@@ -815,7 +817,7 @@
>                             "defaultContent": "Any item",
>                             "render": function(data,type,row,meta) {
>                                 if ( row.item ) {
>-                                    return row.item.external_id;
>+                                    return row.item.external_id + " (" + row.booking_id + ")";
>                                 } else {
>                                     return null;
>                                 }
>@@ -842,10 +844,14 @@
>                         {
>                             "data": "",
>                             "title": "Actions",
>+                            "class": "actions",
>                             "searchable": false,
>                             "orderable": false,
>                             "render": function(data, type, row, meta) {
>-                                var result = '<button type="button" class="btn btn-default btn-xs cancel-action" data-toggle="modal" data-target="#cancelBookingModal" data-booking="'+row.booking_id+'"><i class="fa fa-trash" aria-hidden="true"></i> '+_("Cancel")+'</button>';
>+                                let result = "";
>+                                [% IF CAN_user_circulate_manage_bookings %]
>+                                result += '<button type="button" class="btn btn-default btn-xs cancel-action" data-toggle="modal" data-target="#cancelBookingModal" data-booking="'+row.booking_id+'"><i class="fa fa-trash" aria-hidden="true"></i> '+_("Cancel")+'</button>';
>+                                [% END %]
>                                 return result;
>                             }
>                         }]
>-- 
>2.45.0

Actions: View | Diff | Splinter Review

Attachments on bug 33737: 161045 | 161046 | 161047 | 162253 | 162254 | 162255 | 162256 | 163557 | 164994 | 164995 | 164996 | 164997 | 166513 | 166514 | 166515 | 166516 | 166565 | 166566 | 166567 | 166568 | 166570 | 166573 | 166577