From 515a287bf7b189d7cc8f7da01ce29f0bf37a2afa Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sun, 23 Apr 2023 20:51:04 +0000 Subject: [PATCH] Bug 33314: Fix link into staff catalog and link text Both fixes concern the TICKET_NOTIFY message. * biblio-title.inc builds a link with the intention of using it inside the Koha GUI. Therefore the baseURL part is missing. But we can use it for display and wrap it into a link. * Changes second link from reading 'page' to 'concern management page'. Accessiblity guidelines teach us that you should not link general terms, but always be specific. To test: 1. Make sure staffClientBaseURL is filled correctly 2. Enable CatalogConcerns 3. Enter an email address in CatalogerEmails 4. Go to a bibliographic record in the staff interface or in the OPAC 5. Click New > New catalog concern 6. Fill out the form and click Submit 7. Check the message_queue table for the message 8. Verify the first link is not working (incomplete) and the second is 'page' 9. Apply patch, drop db, create db and run web installer 10. Repeat setup and testing 11. Both links should now be updated and working Signed-off-by: David Nind Signed-off-by: Martin Renvoize --- installer/data/mysql/db_revs/221200010.pl | 2 +- installer/data/mysql/en/mandatory/sample_notices.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/installer/data/mysql/db_revs/221200010.pl b/installer/data/mysql/db_revs/221200010.pl index 2a4921d4be..004d2e2ca7 100755 --- a/installer/data/mysql/db_revs/221200010.pl +++ b/installer/data/mysql/db_revs/221200010.pl @@ -121,7 +121,7 @@ return { $dbh->do( q{ INSERT IGNORE INTO letter(module,code,branchcode,name,is_html,title,content,message_transport_type) - VALUES ( 'catalogue', 'TICKET_NOTIFY', '', 'Catalog concern notification', '1', 'Catalog concern reported', "[%- USE Koha -%][%- PROCESS 'html_helpers.inc' -%]\r\nDear cataloger,

[%- INCLUDE 'patron-title.inc' patron => ticket.reporter -%]reported the following concern with [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 1 -%]

[%- ticket.body -%]

You can mark this concern as resolved from the concern management page.", 'email' ); + VALUES ( 'catalogue', 'TICKET_NOTIFY', '', 'Catalog concern notification', '1', 'Catalog concern reported', "[%- USE Koha -%][%- PROCESS 'html_helpers.inc' -%]\r\nDear cataloger,

[%- INCLUDE 'patron-title.inc' patron => ticket.reporter -%]reported the following concern with [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 0 -%]

[%- ticket.body -%]

You can mark this concern as resolved from the concern management page.", 'email' ); } ); say $out "Added new notice 'TICKET_NOTIFY'"; diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml index 8976840cec..15adee5090 100644 --- a/installer/data/mysql/en/mandatory/sample_notices.yml +++ b/installer/data/mysql/en/mandatory/sample_notices.yml @@ -112,11 +112,11 @@ tables: - "[%- PROCESS 'html_helpers.inc' -%]" - "[%- USE Koha -%]" - "Dear cataloger,
" - - "[%- INCLUDE 'patron-title.inc' patron => ticket.reporter -%] reported the following concern with [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 1 -%]
" + - "[%- INCLUDE 'patron-title.inc' patron => ticket.reporter -%] reported the following concern with [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 0 -%]
" - "
" - "[%- ticket.body -%]
" - "
" - - "You can mark this concern as resolved from the concern management page." + - "You can mark this concern as resolved from the concern management page." - module: circulation code: ACCOUNT_CREDIT -- 2.40.1