Attachment 164344 Details for Bug 33568 – Bug 33568: Restore host records

[patch] Bug 33568: Restore host records

Bug-33568-Restore-host-records.patch (text/plain), 5.28 KB, created by Jonathan Druart on 2024-04-03 07:40:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2024-04-03 07:40:02 UTC

Size: 5.28 KB

patch

obsolete

>From e35a87a60f92b3272d73a4f6a08bed3aa0f97b90 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Wed, 24 May 2023 15:02:30 +0200
>Subject: [PATCH] Bug 33568: Restore host records
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>
>Signed-off-by: Laurence Rault <laurence.rault@biblibre.com>
>Signed-off-by: Emily Lamancusa <emily.lamancusa@montgomerycountymd.gov>
>Signed-off-by: TomÃ¡s Cohen Arazi <tomascohen@theke.io>
>---
> api/v1/swagger/definitions/item.yaml                |  4 ++++
> api/v1/swagger/paths/biblios.yaml                   |  1 +
> catalogue/detail.pl                                 |  4 ----
> .../prog/en/modules/catalogue/detail.tt             | 13 +++++++------
> 4 files changed, 12 insertions(+), 10 deletions(-)
>
>diff --git a/api/v1/swagger/definitions/item.yaml b/api/v1/swagger/definitions/item.yaml
>index cb7894a899c..a5d6066fd63 100644
>--- a/api/v1/swagger/definitions/item.yaml
>+++ b/api/v1/swagger/definitions/item.yaml
>@@ -242,6 +242,10 @@ properties:
>     type:
>       - object
>       - "null"
>+  biblio:
>+    type:
>+      - object
>+      - "null"
>   checkout:
>     type:
>       - object
>diff --git a/api/v1/swagger/paths/biblios.yaml b/api/v1/swagger/paths/biblios.yaml
>index a0f83fd9c23..65dbcd6f881 100644
>--- a/api/v1/swagger/paths/biblios.yaml
>+++ b/api/v1/swagger/paths/biblios.yaml
>@@ -423,6 +423,7 @@
>           type: string
>           enum:
>             - +strings
>+            - biblio.title
>             - checkout
>             - checkout.patron
>             - transfer
>diff --git a/catalogue/detail.pl b/catalogue/detail.pl
>index 774dab7c109..f3ae21949f0 100755
>--- a/catalogue/detail.pl
>+++ b/catalogue/detail.pl
>@@ -198,9 +198,6 @@ my $items_params = {
> my $all_items = $biblio->items($items_params);
> my $items_to_display = $all_items->search({ $include_lost_items ? () : ( itemlost => 0 ) });
> 
>-# flag indicating existence of at least one item linked via a host record
>-my $hostrecords = $biblio->host_items->count;
>-
> my $dat = &GetBiblioData($biblionumber);
> 
> #is biblio a collection and are bundles enabled
>@@ -354,7 +351,6 @@ $template->param(
> $template->param(
>     MARCNOTES               => !$invalid_marc_record ? $biblio->get_marc_notes() : undef,
>     z3950_search_params     => C4::Search::z3950_search_args($dat),
>-    hostrecords             => $hostrecords,
>     C4::Search::enabled_staff_search_views,
> );
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>index 287493fef8d..c845bf48769 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>@@ -368,7 +368,7 @@
>             <th id="[% tab | html %]_materials" data-colname="[% tab | html %]_materials">Materials specified</th>
>             <th id="[% tab | html %]_itemnotes" data-colname="[% tab | html %]_itemnotes">Public notes</th>
>             <th id="[% tab | html %]_itemnotes_nonpublic" data-colname="[% tab | html %]_itemnotes_nonpublic">Non-public notes</th>
>-            [% IF ( hostrecords ) %]<th id="[% tab | html %]_hostrecord" data-colname="[% tab | html %]_hostrecord">Host records</th>[% END %]
>+            <th id="[% tab | html %]_hostrecord" data-colname="[% tab | html %]_hostrecord">Host records</th>
>             [% IF ( analyze ) %]<th id="[% tab | html %]_usedin" data-colname="[% tab | html %]_usedin">Used in</th><th></th>[% END %]
>             [% IF Koha.Preference('UseCourseReserves') %]<th id="[% tab | html %]_course_reserves" data-colname="[% tab | html %]_course_reserves">Course reserves</th>[% END %]
>             [% IF ( SpineLabelShowPrintOnBibDetails ) %]<th id="[% tab | html %]_spinelabel" data-colname="[% tab | html %]_spinelabel" class="NoSort">Spine label</th>[% END %]
>@@ -2194,6 +2194,9 @@
>             embed.push('course_item.course_reserves.course');
>         [% END %]
> 
>+        // For host records
>+        embed.push('biblio.title');
>+
>         let items_table_settings = {
>             holdings: [% TablesSettings.GetTableSettings('catalogue', 'detail','holdings_table','json') | $raw %],
>             otherholdings: [% TablesSettings.GetTableSettings('catalogue', 'detail','otherholdings_table','json')  | $raw %],
>@@ -2589,17 +2592,15 @@
>                         return escape_str(row.internal_notes);
>                     }
>                 },
>-                [% IF ( hostrecords ) %]
>                 {
>-                    data: "biblio.biblio_id",
>-                    searchable: false, // FIXME
>+                    data: "biblio.title",
>+                    searchable: false,
>                     orderable: true,
>                     render: function (data, type, row, meta) {
>                         if ( row.biblio_id == [% biblio.biblionumber | html %] ) return "";
>-                        return '<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=%s>%s</a>'.format(row.biblio_id, row.biblio.title);
>+                        return '<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=%s">%s</a>'.format(row.biblio_id, row.biblio.title);
>                     }
>                 },
>-                [% END %]
>                 [% IF ( analyze ) %]
>                 {
>                     data: "",
>-- 
>2.34.1

Actions: View | Diff | Splinter Review

Attachments on bug 33568: 151339 | 153791 | 164308 | 164309 | 164310 | 164311 | 164312 | 164313 | 164314 | 164315 | 164316 | 164317 | 164318 | 164319 | 164320 | 164321 | 164322 | 164323 | 164324 | 164325 | 164326 | 164327 | 164328 | 164329 | 164330 | 164331 | 164332 | 164333 | 164334 | 164335 | 164336 | 164337 | 164338 | 164339 | 164340 | 164341 | 164342 | 164343 | 164344 | 164345 | 164346 | 164347 | 164348 | 164349 | 164350 | 164351 | 164352 | 164353 | 164354 | 164355 | 164356 | 164358 | 164359 | 164360 | 164361 | 164362 | 164363 | 164364 | 164365 | 164366 | 164367 | 164368 | 164369 | 164370 | 164371 | 164372 | 164373 | 164374 | 164472 | 164480 | 164482 | 164483 | 164485 | 164528