Bugzilla – Attachment 182775 Details for
Bug 36020
Port default recall notices to Template Toolkit
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 36020: (QA follow-up) A few minor corrections
Bug-36020-QA-follow-up-A-few-minor-corrections.patch (text/plain), 3.90 KB, created by
Emily Lamancusa (emlam)
on 2025-05-23 16:10:24 UTC
(
hide
)
Description:
Bug 36020: (QA follow-up) A few minor corrections
Filename:
MIME Type:
Creator:
Emily Lamancusa (emlam)
Created:
2025-05-23 16:10:24 UTC
Size:
3.90 KB
patch
obsolete
>From e3b2f8939c3ff866fd345a3a000407c85dbb019b Mon Sep 17 00:00:00 2001 >From: Emily Lamancusa <emily.lamancusa@montgomerycountymd.gov> >Date: Fri, 23 May 2025 11:15:43 -0400 >Subject: [PATCH] Bug 36020: (QA follow-up) A few minor corrections > >Remove unneeded <br> in RECALL_REQUESTER_DET > >Add IFs to RECALL_REQUESTER_DET to avoid displaying empty lines if >there is no phone, email, and/or callnumber to display > >Use checkout.date_due instead of item.onloan due to bug 39985 > >Signed-off-by: Emily Lamancusa <emily.lamancusa@montgomerycountymd.gov> >--- > installer/data/mysql/en/mandatory/sample_notices.yml | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > >diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml >index 276324f1e0..3a10265310 100644 >--- a/installer/data/mysql/en/mandatory/sample_notices.yml >+++ b/installer/data/mysql/en/mandatory/sample_notices.yml >@@ -2466,7 +2466,7 @@ tables: > - "<br>" > - "[%~ INCLUDE 'patron-title.inc' patron => borrower, no_title => 1, no_cardnumber => 1 ~%],<br>" > - "<br>" >- - "A recall has been placed on the following item:[%~ INCLUDE 'biblio-title.inc' biblio=biblio link = 0 %][% IF biblio.author %]/ [% biblio.author %][% END %] ([% item.barcode %]). The due date has been updated, and is now [% item.onloan | $KohaDates %]. Please return the item before the due date.<br>" >+ - "A recall has been placed on the following item:[%~ INCLUDE 'biblio-title.inc' biblio=biblio link = 0 %][% IF biblio.author %]/ [% biblio.author %][% END %] ([% item.barcode %]). The due date has been updated, and is now [% checkout.date_due | $KohaDates %]. Please return the item before the due date.<br>" > - "<br>" > - "Thank you!" > >@@ -2479,7 +2479,7 @@ tables: > message_transport_type: email > lang: default > content: >- - "[%- USE Branches -%]<br>" >+ - "[%- USE Branches -%]" > - "Date: [% today | $KohaDates %]<br>" > - "<br>" > - "[%~ INCLUDE 'patron-title.inc' patron => borrower, no_title => 1, no_cardnumber => 1, no_html = 1 ~%],<br>" >@@ -2497,7 +2497,7 @@ tables: > message_transport_type: sms > lang: default > content: >- - "Your item has been recalled: [% INCLUDE 'biblio-title.inc' biblio=biblio link = 0 %] ([% item.barcode %]). Please return it by [% item.onloan | $KohaDates %]." >+ - "Your item has been recalled: [% INCLUDE 'biblio-title.inc' biblio=biblio link=0 %] ([% item.barcode %]). Please return by [% checkout.date_due | $KohaDates %]." > > - module: circulation > code: PICKUP_RECALLED_ITEM >@@ -2523,14 +2523,14 @@ tables: > - "<br>" > - "Recall for pickup at [% branch.branchname %]<br>" > - "[% INCLUDE 'patron-title.inc' patron => borrower, no_title => 1, no_html = 1 %]<br>" >- - "[% borrower.phone %]<br>" >+ - "[% IF borrower.phone %][% borrower.phone %]<br>[% END %]" > - "[% borrower.streetnumber %][% IF borrower.address %] [% borrower.address %],[% END %][% IF borrower.address2 %] [% borrower.address2 %],[% END %] [% borrower.city %] [% borrower.state %] [% borrower.zipcode %]<br>" >- - "[% borrower.email %]<br>" >+ - "[% IF borrower.email %][% borrower.email %]<br>[% END %]" > - "<br>" > - "ITEM RECALLED<br>" > - "[% INCLUDE 'biblio-title.inc' biblio=biblio link = 0 %][% IF biblio.author %] by [% biblio.author %][% END %]<br>" > - "Barcode: [% item.barcode %]<br>" >- - "Callnumber: [% item.itemcallnumber %]<br>" >+ - "[% IF item.itemcallnumber %] Callnumber: [% item.itemcallnumber %]<br>[% END %]" > - "Waiting since: [% recall.waiting_date | $KohaDates %]<br>" > - "[% IF recall.notes %]Notes: [% recall.notes %]<br>[% END %]" > >-- >2.34.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 36020
:
166784
|
166934
|
166935
|
170885
|
170886
|
170887
|
170889
|
172134
|
172135
|
172147
|
172148
|
176478
|
176479
|
182711
|
182713
|
182774
| 182775