Bugzilla – Attachment 31926 Details for
Bug 9530
Allow separate 'Reply To' and 'From' email address for notices
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 9530: Adding sysprefs and making changes to the branch table
PASSED-QA-Bug-9530-Adding-sysprefs-and-making-chan.patch (text/plain), 5.96 KB, created by
Martin Renvoize (ashimema)
on 2014-09-30 06:31:14 UTC
(
hide
)
Description:
[PASSED QA] Bug 9530: Adding sysprefs and making changes to the branch table
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2014-09-30 06:31:14 UTC
Size:
5.96 KB
patch
obsolete
>From cbfce7826116671d2f2f21649a925de0257133ec Mon Sep 17 00:00:00 2001 >From: Chris Cormack <chrisc@catalyst.net.nz> >Date: Wed, 28 May 2014 12:12:00 +1200 >Subject: [PATCH] [PASSED QA] Bug 9530: Adding sysprefs and making changes to > the branch table > >To allow for separate Reply To and From email addresses for notices > >This patch will make no functional changes, it just sets up the db >changes needed. > >To Test: >Apply patch, upgrade DB, make sure everything still works fine > >(Or wait to test with following patches) > >Signed-off-by: Owen Leonard <oleonard@myacpl.org> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > installer/data/mysql/kohastructure.sql | 2 ++ > installer/data/mysql/updatedatabase.pl | 14 ++++++++++++++ > .../intranet-tmpl/prog/en/modules/admin/branches.tt | 2 ++ > .../prog/en/modules/admin/preferences/admin.pref | 10 ++++++++++ > 4 files changed, 28 insertions(+) > >diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql >index aeeba17..307ca8b 100644 >--- a/installer/data/mysql/kohastructure.sql >+++ b/installer/data/mysql/kohastructure.sql >@@ -389,6 +389,8 @@ CREATE TABLE `branches` ( -- information about your libraries or branches are st > `branchphone` mediumtext, -- the primary phone for your library or branch > `branchfax` mediumtext, -- the fax number for your library or branch > `branchemail` mediumtext, -- the primary email address for your library or branch >+ `branchreplyto` mediumtext, -- the email to be used as a Reply-To >+ `branchreturnpath` mediumtext, -- the email to be used as Return-Path > `branchurl` mediumtext, -- the URL for your library or branch's website > `issuing` tinyint(4) default NULL, -- unused in Koha > `branchip` varchar(15) default NULL, -- the IP address for your library or branch >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index 6ea5911..6b1c0c4 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -8778,6 +8778,20 @@ if ( CheckVersion($DBversion) ) { > INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('StatisticsFields','location|itype|ccode','Define fields (from the items table) used for statistics members',NULL,'Free') > }); > print "Upgrade to $DBversion done (Bug 12728: Checked syspref StatisticsFields)\n"; >+} >+ >+$DBversion = "3.17.00.XXX"; >+if ( CheckVersion($DBversion) ) { >+ $dbh->do( >+"INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('ReplytoDefault', '', NULL, 'The default email address to be set as replyto.', 'Free')" >+ ); >+ $dbh->do( >+"INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('ReturnpathDefault', '', NULL, 'The default email address to be set as return-path', 'Free')" >+ ); >+ $dbh->do("ALTER TABLE branches ADD branchreplyto mediumtext AFTER branchemail"); >+ $dbh->do("ALTER TABLE branches ADD branchreturnpath mediumtext AFTER branchreplyto"); >+ print >+"Upgrade to $DBversion done (Bug XXX Adding replyto and returnpath addresses.)\n"; > SetVersion($DBversion); > } > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >index f12107f..361d4ab 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >@@ -126,6 +126,8 @@ tinyMCE.init({ > <li><label for="branchphone">Phone: </label><input type="text" name="branchphone" id="branchphone" size="60" value="[% branchphone |html %]" /></li> > <li><label for="branchfax">Fax: </label><input type="text" name="branchfax" id="branchfax" size="60" value="[% branchfax |html %]" /></li> > <li><label for="branchemail">Email: </label><input type="text" name="branchemail" id="branchemail" class="email" size="80" value="[% branchemail |html %]" /></li> >+ <li><label for="branchreply">Reply-To (if different to Email): </label> <input type="text" name="branchreplyto" id="branchreplyto" class="email" size="80" value="[% branchreplyto |html %]" /></li> >+ <li><label for="branchreturnpath">Return-Path (if different to Email): </label> <input type="text" name="branchreturnpath" id="branchreturnpath" class="email" size="80" value="[% branchreturnpath |html %]" /></li> > <li><label for="branchurl">URL: </label><input type="text" name="branchurl" id="branchurl" size="80" value="[% branchurl |html %]" class="url" /></li> > <li><label for="opac_info">OPAC info: </label><textarea name="opac_info" id="opac_info">[% opac_info |html %]</textarea></li> > <li><label for="branchip">IP: </label><input type="text" name="branchip" id="branchip" size="15" maxlength="15" value="[% branchip |html %]" /> <span class="hint">Can be entered as a single IP, or a subnet such as 192.168.1.*</span></li> >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 1215ac1..b58b78c 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 >@@ -7,6 +7,16 @@ Administration: > class: email > - "as the email address for the administrator of Koha. (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.)" > - >+ - Use >+ - pref: ReplytoDefault >+ class: email >+ - "as the email address that will be set as the replyto in emails" >+ - >+ - Use >+ - pref: ReturnpathDefault >+ class: email >+ - "as the email address set as the return path, if you leave this empty the admin address will be used." >+ - > - Show > - pref: DebugLevel > default: 0 >-- >1.7.10.4
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 9530
:
30717
|
30718
|
30719
|
30720
|
30721
|
30722
|
30723
|
30724
|
30725
|
30740
|
30741
|
30742
|
30743
|
30760
|
30761
|
30762
|
30763
|
31169
|
31196
| 31926 |
31927
|
31928
|
31929
|
31930
|
31931
|
31932
|
31933
|
31934
|
31935
|
32799