Bug 5431 - Separate state field for library addresses
Summary: Separate state field for library addresses
Status: CLOSED FIXED
Alias: None
Product: Koha
Classification: Unclassified
Component: System Administration (show other bugs)
Version: 3.4
Hardware: All All
: PATCH-Sent (DO NOT USE) enhancement (vote)
Assignee: Katrin Fischer
QA Contact: Bugs List
URL: /cgi-bin/koha/admin/branches.pl
Keywords:
Depends on:
Blocks:
 
Reported: 2010-11-24 16:00 UTC by Owen Leonard
Modified: 2012-10-25 23:10 UTC (History)
4 users (show)

See Also:
Change sponsored?: ---
Patch complexity: ---
Documentation contact:
Documentation submission:
Text to go in the release notes:
Version(s) released in:


Attachments
proposed patch (7.94 KB, patch)
2010-12-09 06:22 UTC, Katrin Fischer
Details | Diff | Splinter Review
Rebased to current HEAD, corrected display to show as 'city, state zip' (8.43 KB, patch)
2011-01-13 20:47 UTC, Katrin Fischer
Details | Diff | Splinter Review
Signed-off patch (8.02 KB, patch)
2011-04-07 14:31 UTC, Magnus Enger
Details | Diff | Splinter Review
Follow up patch (2.00 KB, patch)
2011-04-11 04:36 UTC, Chris Cormack
Details | Diff | Splinter Review
Signed off patch (948 bytes, patch)
2011-04-11 20:39 UTC, Katrin Fischer
Details | Diff | Splinter Review

Note You need to log in before you can comment on or make changes to this bug.
Description Owen Leonard 2010-11-24 16:00:38 UTC
If the proposed changes for Bug 5422 are accepted, the same change should be made to the way library addresses are stored.
Comment 1 Katrin Fischer 2010-12-09 06:22:21 UTC Comment hidden (obsolete)
Comment 2 Katrin Fischer 2010-12-22 22:40:25 UTC
Rebased and updated the branch on my public repo.
Comment 3 MJ Ray (software.coop) 2011-01-07 11:12:59 UTC
This bug is mentioned in:
Bug 5431: Separate state field for library	addresses http://lists.koha-community.org/pipermail/koha-patches/2010-December/013211.html
Comment 4 Katrin Fischer 2011-01-13 20:47:58 UTC Comment hidden (obsolete)
Comment 5 Nicole C. Engard 2011-01-25 01:32:26 UTC
Doesn't apply


Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying Bug 5431: Separate state field for library addresses
.dotest/patch:47: trailing whitespace.
            $data->{'branchcity'},       $data->{'branchstate'},       
.dotest/patch:125: trailing whitespace.
                            <br /><!-- TMPL_VAR name="branchcity" escape="HTML" --><!-- /TMPL_IF --><!-- TMPL_IF name="branchstate" -->, 
error: patch failed: installer/data/mysql/updatedatabase.pl:3937
error: installer/data/mysql/updatedatabase.pl: patch does not apply
error: patch failed: kohaversion.pl:16
error: kohaversion.pl: patch does not apply
Using index info to reconstruct a base tree...
<stdin>:47: trailing whitespace.
            $data->{'branchcity'},       $data->{'branchstate'},       
<stdin>:125: trailing whitespace.
                            <br /><!-- TMPL_VAR name="branchcity" escape="HTML" --><!-- /TMPL_IF --><!-- TMPL_IF name="branchstate" -->, 
warning: 2 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merged C4/Branch.pm
Auto-merged installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merged kohaversion.pl
CONFLICT (content): Merge conflict in kohaversion.pl
Failed to merge in the changes.
Patch failed at 0001.
When you have resolved this problem run "git-am -i -3 --resolved".
If you would prefer to skip this patch, instead run "git-am -i -3 --skip".
nengard@debian:~/kohaclone$
Comment 6 Chris Cormack 2011-02-01 06:51:18 UTC
Applied to new/awaiting_qa/bug_5431 please test and let me know if it is ok to merge
Comment 7 MJ Ray (software.coop) 2011-03-04 10:27:19 UTC
This bug is mentioned in:
Bug 5431: Separate state field for library	addresses http://lists.koha-community.org/pipermail/koha-patches/2011-February/013731.html
Comment 8 Magnus Enger 2011-04-07 14:31:07 UTC
Created attachment 3805 [details] [review]
Signed-off patch

Behaves as expected. Also tested with notices.
Comment 9 Chris Cormack 2011-04-09 00:08:54 UTC
PAtch pushed, please test
Comment 10 Chris Cormack 2011-04-11 04:30:34 UTC
Bug with ModBranch, please test and signoff the follow up patch
Comment 11 Chris Cormack 2011-04-11 04:36:42 UTC Comment hidden (obsolete)
Comment 12 Katrin Fischer 2011-04-11 20:39:19 UTC
Created attachment 3885 [details] [review]
Signed off patch
Comment 13 Chris Cormack 2011-04-11 20:57:52 UTC
Follow up patch pushed