Bugzilla – Attachment 133351 Details for
Bug 30237
Rename/rephrase AutoEmailOpacUser/ACCTDETAILS feature to clarify intended use
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30237: (follow-up) Make LibraryName conditional
Bug-30237-follow-up-Make-LibraryName-conditional.patch (text/plain), 3.73 KB, created by
Marcel de Rooy
on 2022-04-15 09:31:02 UTC
(
hide
)
Description:
Bug 30237: (follow-up) Make LibraryName conditional
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2022-04-15 09:31:02 UTC
Size:
3.73 KB
patch
obsolete
>From 41a4dfc58a72a557956102bc7d5e2003dbce2b49 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Mon, 11 Apr 2022 15:13:49 +0100 >Subject: [PATCH] Bug 30237: (follow-up) Make LibraryName conditional >Content-Type: text/plain; charset=utf-8 > >It's easy to forget to set the LibraryName preference.. as such we can >make this a conditional and fall back to a default of 'the library'. > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >--- > installer/data/mysql/atomicupdate/bug_30237.pl | 2 +- > installer/data/mysql/en/mandatory/sample_notices.yml | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > >diff --git a/installer/data/mysql/atomicupdate/bug_30237.pl b/installer/data/mysql/atomicupdate/bug_30237.pl >index 4c92eb164b..d05aed7386 100755 >--- a/installer/data/mysql/atomicupdate/bug_30237.pl >+++ b/installer/data/mysql/atomicupdate/bug_30237.pl >@@ -8,7 +8,7 @@ return { > my ($dbh, $out) = @$args{qw(dbh out)}; > # Add WELCOME notice > $dbh->do( q{ >- INSERT IGNORE INTO letter (module, code, name, is_html, title, content, message_transport_type) VALUES ('members', 'WELCOME', 'Welcome notice', 1, "[% USE Koha %]Welcome to [% Koha.Preference('LibraryName') %]", "[% USE Koha %]\r\nHello [% borrower.title %] [% borrower.firstname %] [% borrower.surname %].\r\n\r\nThank you for joining [% Koha.Preference('LibraryName') %]\r\n\r\nYou can search for all our materials in our <a href='[% Koha.Preference('OPACBaseURL') %]'>catalog</a>.\r\n\r\nYour library card number is [% borrower.cardnumber %]\r\n\r\nIf you have any problems or questions regarding your account, please contact the library.", 'email');}); >+ INSERT IGNORE INTO letter (module, code, name, is_html, title, content, message_transport_type) VALUES ('members', 'WELCOME', 'Welcome notice', 1, "[% USE Koha %]Welcome to [% IF Koha.Preference('LibraryName') %][% Koha.Preference('LibraryName') %][% ELSE %]the library[% END %]", "[% USE Koha %]\r\nHello [% borrower.title %] [% borrower.firstname %] [% borrower.surname %].\r\n\r\nThank you for joining [% IF Koha.Preference('LibraryName') %][% Koha.Preference('LibraryName') %][% ELSE %]the library[% END %]\r\n\r\nYou can search for all our materials in our <a href='[% Koha.Preference('OPACBaseURL') %]'>catalog</a>.\r\n\r\nYour library card number is [% borrower.cardnumber %]\r\n\r\nIf you have any problems or questions regarding your account, please contact the library.", 'email');}); > > # Update system preference > $dbh->do( q{ >diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml >index 99fe795dd3..b4fe775cc5 100644 >--- a/installer/data/mysql/en/mandatory/sample_notices.yml >+++ b/installer/data/mysql/en/mandatory/sample_notices.yml >@@ -1068,14 +1068,14 @@ tables: > branchcode: "" > name: "Welcome notice " > is_html: 1 >- title: "[% USE Koha %]Welcome to [% Koha.Preference('LibraryName') %]" >+ title: "[% USE Koha %][% IF Koha.Preference('LibraryName') %]Welcome to [% Koha.Preference('LibraryName') %][% ELSE %]Welcome to the library[% END %]" > message_transport_type: email > lang: default > content: > - "[% USE Koha %]" > - "Hello [% borrower.title %] [% borrower.firstname %] [% borrower.surname %]." > - "" >- - "Thankyou for joining [% Koha.Preference('LibraryName') %]" >+ - "Thankyou for joining [% IF Koha.Preference('LibraryName') %][% Koha.Preference('LibraryName') %][% ELSE %]the library[% END %]" > - "" > - "You can search for all our materials in our <a href='[% Koha.Preference('OPACBaseURL') %]'>catalog</a>." > - "" >-- >2.20.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 30237
:
131489
|
131490
|
131491
|
132785
|
132786
|
132787
|
133153
|
133154
|
133155
|
133156
|
133157
|
133158
|
133159
|
133345
|
133346
|
133347
|
133348
|
133349
|
133350
| 133351 |
133352