Attachment 150135 Details for Bug 33313 – Bug 33313: Fix catalog links in TICKET_NOTIFY

[patch] Bug 33313: Fix catalog links in TICKET_NOTIFY

Bug-33313-Fix-catalog-links-in-TICKETNOTIFY.patch (text/plain), 6.79 KB, created by David Nind on 2023-04-23 19:42:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Nind

Created: 2023-04-23 19:42:22 UTC

Size: 6.79 KB

patch

obsolete

>From 97e3190b46a254a30bdcd789830e5f83da0145c2 Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <katrin.fischer.83@web.de>
>Date: Sun, 23 Apr 2023 11:57:46 +0000
>Subject: [PATCH] Bug 33313: Fix catalog links in TICKET_NOTIFY
>
>This fixes the system preference name from IntranetBaseURL to
>staffClientBaseURL.
>
>Also makes some small typo fixes.
>
>As this feature has just been pushed I chose to fix the
>database updates that will be run when installing 23.05.
>
>To test:
>* Verify the wrong link in TICKET_NOTIFY
>* Drop database, create database, run web installer
>* Verify the link is now correct in the notice
>
>Bonus: Test update from 22.11 to 23.05 and verify the
>notices are correct there as well.
>
>Signed-off-by: David Nind <david@davidnind.com>
>---
> installer/data/mysql/db_revs/221200010.pl | 6 +++---
> installer/data/mysql/en/mandatory/sample_notices.yml | 10 +++++-----
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
>diff --git a/installer/data/mysql/db_revs/221200010.pl b/installer/data/mysql/db_revs/221200010.pl
>index 03d7a85e48..c9a19937af 100755
>--- a/installer/data/mysql/db_revs/221200010.pl
>+++ b/installer/data/mysql/db_revs/221200010.pl
>@@ -89,7 +89,7 @@ return {
> $dbh->do(
> q{
> INSERT IGNORE INTO letter(module,code,branchcode,name,is_html,title,content,message_transport_type)
>- VALUES ( 'catalogue', 'TICKET_ACKNOWLEDGE', '', 'Concern acknowledgement', '1', 'Catalog concern acknowledgement', "[%- PROCESS 'html_helpers.inc' -%]Dear [%- INCLUDE 'patron-title.inc' patron => ticket.reporter -%], Thankyou for your report concerning [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 0 -%]. You reported: [%- ticket.body -%] Thankyou", 'email' );
>+ VALUES ( 'catalogue', 'TICKET_ACKNOWLEDGE', '', 'Concern acknowledgement', '1', 'Catalog concern acknowledgement', "[%- PROCESS 'html_helpers.inc' -%]Dear [%- INCLUDE 'patron-title.inc' patron => ticket.reporter -%], Thankyou for your report concerning [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 0 -%]. You reported: [%- ticket.body -%] Thank you", 'email' );
> }
> );
> say $out "Added new notice 'TICKET_ACKNOWLEDGE'";
>@@ -97,7 +97,7 @@ return {
> $dbh->do(
> q{
> INSERT IGNORE INTO letter(module,code,branchcode,name,is_html,title,content,message_transport_type)
>- VALUES ( 'catalogue', 'TICKET_UPDATE', '', 'Concern updated', '1', 'Catalog concern updated', "[%- PROCESS 'html_helpers.inc' -%]Dear [%- INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter -%], The library has added an update to the concern you reported against [%- INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 -%]. The following comment was left: [%- ticket_update.message -%] Thankyou", 'email' );
>+ VALUES ( 'catalogue', 'TICKET_UPDATE', '', 'Concern updated', '1', 'Catalog concern updated', "[%- PROCESS 'html_helpers.inc' -%]Dear [%- INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter -%], The library has added an update to the concern you reported against [%- INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 -%]. The following comment was left: [%- ticket_update.message -%] Thank you", 'email' );
> }
> );
> say $out "Added new notice 'TICKET_UPDATE'";
>@@ -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 <a href='[%- Koha.Preference('IntranetBaseURL') -%]/cgi-bin/koha/cataloguing/concerns.pl'>page</a>.", '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 = 1 -%] [%- ticket.body -%] You can mark this concern as resolved from the concern management <a href='[%- Koha.Preference('staffClientBaseURL') -%]/cgi-bin/koha/cataloguing/concerns.pl'>page</a>.", '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 e73f6b8167..e529326943 100644
>--- a/installer/data/mysql/en/mandatory/sample_notices.yml
>+++ b/installer/data/mysql/en/mandatory/sample_notices.yml
>@@ -55,12 +55,12 @@ tables:
> - "[%- PROCESS 'html_helpers.inc' -%]"
> - "Dear [%- INCLUDE 'patron-title.inc' patron => ticket.reporter -%], "
> - " "
>- - "Thankyou for your report concerning [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 0 -%]. "
>+ - "Thank you for your report concerning [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 0 -%]. "
> - " "
> - "You reported: "
> - "[%- ticket.body -%] "
> - " "
>- - "Thankyou"
>+ - "Thank you"
> 
> - module: catalogue
> code: TICKET_RESOLVE
>@@ -79,7 +79,7 @@ tables:
> - "The following comment was left: "
> - "[%- ticket_update.message -%] "
> - " "
>- - "Thankyou"
>+ - "Thank you"
> 
> - module: catalogue
> code: TICKET_UPDATE
>@@ -98,7 +98,7 @@ tables:
> - "The following comment was left: "
> - "[%- ticket_update.message -%] "
> - " "
>- - "Thankyou"
>+ - "Thank you"
> 
> - module: catalogue
> code: TICKET_NOTIFY
>@@ -116,7 +116,7 @@ tables:
> - " "
> - "[%- ticket.body -%] "
> - " "
>- - "You can mark this concern as resolved from the concern management <a href='[%- Koha.Preference('IntranetBaseURL') -%]/cgi-bin/koha/cataloguing/concerns.pl'>page</a>."
>+ - "You can mark this concern as resolved from the concern management <a href='[%- Koha.Preference('staffClientBaseURL') -%]/cgi-bin/koha/cataloguing/concerns.pl'>page</a>."
> 
> - module: circulation
> code: ACCOUNT_CREDIT
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 33313: 150130 | 150135 | 151384 | 151417