Summary: | Separate state field for library addresses | ||
---|---|---|---|
Product: | Koha | Reporter: | Owen Leonard <oleonard> |
Component: | System Administration | Assignee: | Katrin Fischer <katrin.fischer> |
Status: | CLOSED FIXED | QA Contact: | Bugs List <koha-bugs> |
Severity: | enhancement | ||
Priority: | PATCH-Sent (DO NOT USE) | CC: | chris, gmcharlt, magnus, nengard |
Version: | 3.4 | ||
Hardware: | All | ||
OS: | All | ||
URL: | /cgi-bin/koha/admin/branches.pl | ||
Change sponsored?: | --- | Patch complexity: | --- |
Documentation contact: | Documentation submission: | ||
Text to go in the release notes: | Version(s) released in: | ||
Circulation function: | |||
Attachments: |
proposed patch
Rebased to current HEAD, corrected display to show as 'city, state zip' Signed-off patch Follow up patch Signed off patch |
Description
Owen Leonard
2010-11-24 16:00:38 UTC
Created attachment 2823 [details] [review] proposed patch These changes are also available for testing on my public repo: https://github.com/kfischer/Koha/tree/5431_state_branch Rebased and updated the branch on my public repo. 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 Created attachment 2989 [details] [review] Rebased to current HEAD, corrected display to show as 'city, state zip' 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$ Applied to new/awaiting_qa/bug_5431 please test and let me know if it is ok to merge 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 Created attachment 3805 [details] [review] Signed-off patch Behaves as expected. Also tested with notices. PAtch pushed, please test Bug with ModBranch, please test and signoff the follow up patch Created attachment 3855 [details] [review] Follow up patch Created attachment 3885 [details] [review] Signed off patch Follow up patch pushed |