Bugzilla – Attachment 31928 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 9350: Making changes so that you can add the new fields to branches
PASSED-QA-Bug-9350-Making-changes-so-that-you-can-.patch (text/plain), 4.96 KB, created by
Martin Renvoize (ashimema)
on 2014-09-30 06:31:31 UTC
(
hide
)
Description:
[PASSED QA] Bug 9350: Making changes so that you can add the new fields to branches
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2014-09-30 06:31:31 UTC
Size:
4.96 KB
patch
obsolete
>From 3fbb605d4002e3714598637ec4c1d2b6320fc3a2 Mon Sep 17 00:00:00 2001 >From: Chris Cormack <chrisc@catalyst.net.nz> >Date: Tue, 12 Aug 2014 09:57:06 +1200 >Subject: [PATCH] [PASSED QA] Bug 9350: Making changes so that you can add the > new fields to branches > >To test > >1/ Apply patch >2/ Add or Edit a branch, filling out the new fields >3/ Check that the changes saved > >http://bugs.koha-community.org/show_bug.cgi?id=9530 >Signed-off-by: Owen Leonard <oleonard@myacpl.org> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > C4/Branch.pm | 10 +++++++--- > admin/branches.pl | 2 ++ > koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt | 2 +- > 3 files changed, 10 insertions(+), 4 deletions(-) > >diff --git a/C4/Branch.pm b/C4/Branch.pm >index 83d2010..ff571dc 100644 >--- a/C4/Branch.pm >+++ b/C4/Branch.pm >@@ -202,8 +202,9 @@ sub ModBranch { > (branchcode,branchname,branchaddress1, > branchaddress2,branchaddress3,branchzip,branchcity,branchstate, > branchcountry,branchphone,branchfax,branchemail, >- branchurl,branchip,branchprinter,branchnotes,opac_info) >- VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) >+ branchurl,branchip,branchprinter,branchnotes,opac_info, >+ branchreplyto, branchreturnpath) >+ VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) > "; > my $sth = $dbh->prepare($query); > $sth->execute( >@@ -216,6 +217,7 @@ sub ModBranch { > $data->{'branchemail'}, $data->{'branchurl'}, > $data->{'branchip'}, $data->{'branchprinter'}, > $data->{'branchnotes'}, $data->{opac_info}, >+ $data->{'branchreplyto'}, $data->{'branchreturnpath'} > ); > return 1 if $dbh->err; > } else { >@@ -225,7 +227,8 @@ sub ModBranch { > branchaddress2=?,branchaddress3=?,branchzip=?, > branchcity=?,branchstate=?,branchcountry=?,branchphone=?, > branchfax=?,branchemail=?,branchurl=?,branchip=?, >- branchprinter=?,branchnotes=?,opac_info=? >+ branchprinter=?,branchnotes=?,opac_info=?, >+ branchreplyto=?, branchreturnpath=? > WHERE branchcode=? > "; > my $sth = $dbh->prepare($query); >@@ -239,6 +242,7 @@ sub ModBranch { > $data->{'branchemail'}, $data->{'branchurl'}, > $data->{'branchip'}, $data->{'branchprinter'}, > $data->{'branchnotes'}, $data->{opac_info}, >+ $data->{'branchreplyto'}, $data->{'branchreturnpath'}, > $data->{'branchcode'}, > ); > } >diff --git a/admin/branches.pl b/admin/branches.pl >index 7c4b539..2aa87df 100755 >--- a/admin/branches.pl >+++ b/admin/branches.pl >@@ -402,6 +402,8 @@ sub _branch_to_template { > branchphone => $data->{'branchphone'}, > branchfax => $data->{'branchfax'}, > branchemail => $data->{'branchemail'}, >+ branchreplyto => $data->{'branchreplyto'}, >+ branchreturnpath => $data->{'branchreturnpath'}, > branchurl => $data->{'branchurl'}, > opac_info => $data->{'opac_info'}, > branchip => $data->{'branchip'}, >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 361d4ab..2cb6237 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >@@ -126,7 +126,7 @@ 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="branchreplyto">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> >-- >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