Attachment 163563 Details for Bug 35813 – Bug 35813: Migrate 'transient_result' to 'messages.inc'

[patch] Bug 35813: Migrate 'transient_result' to 'messages.inc'

Bug-35813-Migrate-transientresult-to-messagesinc.patch (text/plain), 5.47 KB, created by Martin Renvoize (ashimema) on 2024-03-20 16:38:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2024-03-20 16:38:57 UTC

Size: 5.47 KB

patch

obsolete

>From 9a3d65fc222e5f09041d33bdc85fdcdd57aff4f4 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Mon, 19 Feb 2024 09:50:22 +0000
>Subject: [PATCH] Bug 35813: Migrate 'transient_result' to 'messages.inc'
>
>This patch DRY's out the code by migrating the transient_result div into
>the now widely included messages.inc include.
>---
> koha-tmpl/intranet-tmpl/prog/en/includes/messages.inc          | 1 +
> koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt       | 2 +-
> .../intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt      | 3 +--
> .../intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt      | 1 -
> koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt    | 3 +--
> .../prog/en/modules/catalogue/labeledMARCdetail.tt             | 1 -
> .../intranet-tmpl/prog/en/modules/catalogue/moredetail.tt      | 1 -
> 7 files changed, 4 insertions(+), 8 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/messages.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/messages.inc
>index 34ebe5c6e79..ceb30b9197b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/messages.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/messages.inc
>@@ -1,3 +1,4 @@
> <div id="messages">
>     [% INCLUDE 'blocking_errors.inc' %]
>+    <div id="transient_result"></div>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt
>index c5ef30b3e5f..2ae7ec3feb8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt
>@@ -38,7 +38,7 @@
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>                 <div class="row">
>-                    <div id="transient_result"></div>
>+                    [% INCLUDE 'messages.inc' %]
>                     [% INCLUDE 'cat-toolbar.inc' %]
>                     <h1>Bookings for [% INCLUDE 'biblio-title-head.inc' %]</h1>
>                     <div class="page-section" id="bookings-timeline"></div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt
>index dfc82cbb253..ee6aba2dd9e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt
>@@ -48,8 +48,7 @@
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>                 [% INCLUDE 'messages.inc' %]
>-                <div id="transient_result"></div>
>-            [% INCLUDE 'cat-toolbar.inc' %]
>+                [% INCLUDE 'cat-toolbar.inc' %]
>                 <h1>
>                     [% IF ( unknownbiblionumber ) %]
>                         Unknown record
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
>index 6ed54945248..75acf77a0b0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
>@@ -55,7 +55,6 @@
>   <div class="dialog message">The record you requested does not exist ([% biblionumber | html %]).</div>
> [% ELSE %]
> 
>-<div id="transient_result"></div>
> [% INCLUDE 'cat-toolbar.inc' %]
> 
> [% UNLESS ( popup ) %]
>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 9038da31976..6b57820436d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>@@ -80,8 +80,8 @@
>     <div class="row">
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>-                [% INCLUDE 'messages.inc' %]
>                 <div class="row">
>+                [% INCLUDE 'messages.inc' %]
> 
> [% IF ( unknownbiblionumber ) %]
>   <div class="dialog message">The record you requested does not exist ([% biblionumber | html %]).</div>
>@@ -92,7 +92,6 @@
> [% CoceHost        = Koha.Preference('CoceHost') %]
> [% SyndeticsCovers = Koha.Preference('SyndeticsEnabled') && Koha.Preference('SyndeticsCoverImages') %]
> 
>-<div id="transient_result"></div>
> [% INCLUDE 'cat-toolbar.inc' %]
>     [% IF ( ocoins ) %]
>         
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
>index 845d47f6ecb..95eceaea958 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
>@@ -47,7 +47,6 @@
>     [% IF ( unknownbiblionumber ) %]
>         <div class="dialog message">The record you requested does not exist ([% biblionumber | html %]).</div>
>     [% ELSE %]
>-                <div id="transient_result"></div>
>                 [% INCLUDE 'cat-toolbar.inc' %]
> 
>                 <h1>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
>index 2e43b3c45f4..6ef020cecbd 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
>@@ -42,7 +42,6 @@
>         <div class="col-sm-10 col-sm-push-2">
>             <main>
>                 [% INCLUDE 'messages.inc' %]
>-                <div id="transient_result"></div>
>                 [% INCLUDE 'cat-toolbar.inc' %]
> 
>                 <h1>Item details for [% INCLUDE 'biblio-title-head.inc' %]</h1>
>-- 
>2.44.0

Actions: View | Diff | Splinter Review

Attachments on bug 35813: 161048 | 161058 | 161059 | 161086 | 161087 | 162263 | 162264 | 162265 | 163561 | 163562 | 163563 | 166579 | 166580 | 166581