From 9b169b59a0156a1926e02f8e2458c1aa51b2b0ad Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Wed, 5 Apr 2017 04:19:18 +0000 Subject: [PATCH] Bug 14537: Renaming OverdueNoticeBcc to NoticeBcc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To test: 1) Apply patch and update database 2) Run 'git grep "OverdueNoticeBcc"' and confirm there are no other instances Sponsored-by: Catalyst IT Signed-off-by: Marc Véron --- C4/Letters.pm | 2 +- .../mysql/atomicupdate/bug_14537_-_rename_OverdueNoticeBcc_syspref.sql | 1 + installer/data/mysql/sysprefs.sql | 2 +- .../intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug_14537_-_rename_OverdueNoticeBcc_syspref.sql diff --git a/C4/Letters.pm b/C4/Letters.pm index 74263f0..cf13bae 100644 --- a/C4/Letters.pm +++ b/C4/Letters.pm @@ -1338,7 +1338,7 @@ sub _send_message_by_email { ); $sendmail_params{'Auth'} = {user => $username, pass => $password, method => $method} if $username; - if ( my $bcc = C4::Context->preference('OverdueNoticeBcc') ) { + if ( my $bcc = C4::Context->preference('NoticeBcc') ) { $sendmail_params{ Bcc } = $bcc; } diff --git a/installer/data/mysql/atomicupdate/bug_14537_-_rename_OverdueNoticeBcc_syspref.sql b/installer/data/mysql/atomicupdate/bug_14537_-_rename_OverdueNoticeBcc_syspref.sql new file mode 100644 index 0000000..59f211b --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_14537_-_rename_OverdueNoticeBcc_syspref.sql @@ -0,0 +1 @@ +UPDATE systempreferences SET variable="NoticeBcc" WHERE variable="OverdueNoticeBcc"; diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 7e249b7..01a78f1 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -274,6 +274,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('NorwegianPatronDBSearchNLAfterLocalHit','0',NULL,'Search NL if a search has already given one or more local hits?.','YesNo'), ('NotesBlacklist','',NULL,'List of notes fields that should not appear in the title notes/description separator of details','free'), ('NotHighlightedWords','and|or|not',NULL,'List of words to NOT highlight when OpacHitHighlight is enabled','free'), +('NoticeBcc','','','Email address to bcc outgoing overdue notices sent by email','free'), ('NoticeCSS','',NULL,'Notices CSS url.','free'), ('NotifyBorrowerDeparture','30',NULL,'Define number of days before expiry where circulation is warned about patron account expiry','Integer'), ('NovelistSelectEnabled','0',NULL,'Enable Novelist Select content. Requires Novelist Profile and Password','YesNo'), @@ -396,7 +397,6 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('OverDriveClientKey','','Client key for OverDrive integration','30','Free'), ('OverDriveClientSecret','','Client key for OverDrive integration','30','YesNo'), ('OverDriveLibraryID','','Library ID for OverDrive integration','','Integer'), -('OverdueNoticeBcc','','','Email address to bcc outgoing overdue notices sent by email','free'), ('OverdueNoticeCalendar',0,NULL,'Take the calendar into consideration when generating overdue notices','YesNo'), ('OverduesBlockCirc','noblock','noblock|confirmation|block','When checking out an item should overdues block checkout, generate a confirmation dialogue, or allow checkout','Choice'), ('OverduesBlockRenewing','allow','allow|blockitem|block','If any of patron checked out documents is late, should renewal be allowed, blocked only on overdue items or blocked on whatever checked out document','Choice'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref index 9478192..6238231 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref @@ -348,7 +348,7 @@ Circulation: - "patrons to return books before their accounts expire (by restricting due dates to before the patron's expiration date)." - - Send all notices as a BCC to this email address - - pref: OverdueNoticeBcc + - pref: NoticeBcc - - pref: OverdueNoticeCalendar choices: -- 2.1.4