From 85b2bc8cd0737ba583e5e6f3585d69ac99d0671f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nazl=C4=B1=20=C3=87etin?= Date: Tue, 30 Apr 2019 15:53:20 +0000 Subject: [PATCH] Bug 5770: New system pref for new suggestion email Signed-off-by: Liz Rea Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens --- .../data/mysql/atomicupdate/bug_5770.perl | 41 +++++++++++++++++++ installer/data/mysql/sysprefs.sql | 2 + .../en/modules/admin/preferences/admin.pref | 11 +++++ 3 files changed, 54 insertions(+) create mode 100644 installer/data/mysql/atomicupdate/bug_5770.perl diff --git a/installer/data/mysql/atomicupdate/bug_5770.perl b/installer/data/mysql/atomicupdate/bug_5770.perl new file mode 100644 index 0000000000..12e0d09c9c --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_5770.perl @@ -0,0 +1,41 @@ +$DBversion = '18.12.00.XXX'; # will be replaced by the RM +if( CheckVersion( $DBversion ) ) { + $dbh->do( q{ + INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES + ('EmailPurchaseSuggestions','KohaAdminEmailAddress','EmailAddressForSuggestions|BranchEmailAddress|KohaAdminEmailAddress','Choose email address that will be sent new purchase suggestions','Choice'), + ('EmailAddressForSuggestions','','','If you choose EmailAddressForSuggestions you should enter a valid email address','free') + }); + + $dbh->do( q{ + INSERT IGNORE INTO `letter` (module, code, name, title, content, is_html, message_transport_type) VALUES + ('suggestions','NEW_SUGGESTION','New suggestion','New suggestion','

Suggestion pending approval

+

Suggested by

+
    +
  • <> <>
    • +
  • <>
    • +
  • <>
    • +
  • <>
    • +
+

+

Title suggested

+
    +
  • Library: <>
    • +
  • Title: <>
    • +
  • Author: <>
    • +
  • Copyright date: <>
    • +
  • Standard number (ISBN, ISSN or other): <>
    • +
  • Publisher: <>
    • +
  • Collection title: <>
    • +
  • Publication place: <>
    • +
  • Quantity: <>
    • +
  • Item type: <>
    • +
  • Reason for suggestion: <>
    • +
  • Notes: <>
    • +
+

',1, 'email') + }); + + # Always end with this (adjust the bug info) + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 5770 - Email librarian when purchase suggestion made)\n"; +} diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 51e6e96186..06144ed773 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -159,7 +159,9 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('EasyAnalyticalRecords','0','','If on, display in the catalogue screens tools to easily setup analytical record relationships','YesNo'), ('ElasticsearchIndexStatus_authorities', '0', 'Authorities index status', NULL, NULL), ('ElasticsearchIndexStatus_biblios', '0', 'Biblios index status', NULL, NULL), +('EmailAddressForSuggestions','','',' If you choose EmailAddressForSuggestions you have to enter a valid email address: ','free'), ('emailLibrarianWhenHoldIsPlaced','0',NULL,'If ON, emails the librarian whenever a hold is placed','YesNo'), +('EmailPurchaseSuggestions','KohaAdminEmailAddress','EmailAddressForSuggestions|BranchEmailAddress|KohaAdminEmailAddress','Choose email address that new purchase suggestions will be sent to: ','Choice'), ('EnableAdvancedCatalogingEditor','0','','Enable the Rancor advanced cataloging editor','YesNo'), ('EnableBorrowerFiles','0',NULL,'If enabled, allows librarians to upload and attach arbitrary files to a borrower record.','YesNo'), ('EnableOpacSearchHistory','1','YesNo','Enable or disable opac search history',''), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref index 5bf920ba25..5347f270a0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref @@ -6,6 +6,17 @@ Administration: - pref: KohaAdminEmailAddress class: email - "(This is the default From: address for emails unless there is one for the particular library, and is referred to when an internal error occurs.)" + - + - "Choose email address that new purchase suggestions will be sent to: " + - pref: EmailPurchaseSuggestions + default: KohaAdminEmailAddress + choices: + EmailAddressForSuggestions: EmailAddressForSuggestions + BranchEmailAddress: email address of branch + KohaAdminEmailAddress: KohaAdminEmailAddress + - "If you choose EmailAddressForSuggestions you have to enter a valid email address: " + - pref: EmailAddressForSuggestions + class: email - - "Email address to be set as the replyto in emails: " - pref: ReplytoDefault -- 2.39.5