[Bug 5431] New: Separate state field for library addresses
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5431 Summary: Separate state field for library addresses Change sponsored?: --- Product: Koha Version: rel_3_4 Platform: All URL: /cgi-bin/koha/admin/branches.pl OS/Version: All Status: NEW Severity: enhancement Priority: P5 Component: System Administration AssignedTo: paul.poulain@biblibre.com ReportedBy: oleonard@myacpl.org QAContact: koha-bugs@lists.koha-community.org CC: gmcharlt@gmail.com Estimated Hours: 0.0 If the proposed changes for Bug 5422 are accepted, the same change should be made to the way library addresses are stored. -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA contact for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5431 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED AssignedTo|paul.poulain@biblibre.com |katrin.fischer@bsz-bw.de --- Comment #1 from Katrin Fischer <katrin.fischer@bsz-bw.de> 2010-12-09 06:22:21 UTC --- Created attachment 2823 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=2823 proposed patch These changes are also available for testing on my public repo: https://github.com/kfischer/Koha/tree/5431_state_branch -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA contact for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5431 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Priority|P5 |PATCH-Sent Patch Status|--- |Needs Signoff -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA contact for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5431 --- Comment #2 from Katrin Fischer <katrin.fischer@bsz-bw.de> 2010-12-22 22:40:25 UTC --- Rebased and updated the branch on my public repo. -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA contact for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5431 --- Comment #3 from MJ Ray (software.coop) <mjr@ttllp.co.uk> 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.... -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA contact for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5431 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #2823|0 |1 is obsolete| | --- Comment #4 from Katrin Fischer <katrin.fischer@bsz-bw.de> 2011-01-13 20:47:58 UTC --- Created attachment 2989 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=2989 Rebased to current HEAD, corrected display to show as 'city, state zip' -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA contact for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5431 Nicole C. Engard <nengard@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |nengard@gmail.com Patch Status|Needs Signoff |Does not apply --- Comment #5 from Nicole C. Engard <nengard@gmail.com> 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$ -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA contact for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5431 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |chris@bigballofwax.co.nz Patch Status|Does not apply |Needs Signoff --- Comment #6 from Chris Cormack <chris@bigballofwax.co.nz> 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 -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA contact for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5431 Nicole C. Engard <nengard@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch Status|Needs Signoff |Pushed For QA --- Comment #7 from MJ Ray (software.coop) <mjr@ttllp.co.uk> 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.... -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5431 Magnus Enger <magnus@enger.priv.no> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #2989|0 |1 is obsolete| | --- Comment #8 from Magnus Enger <magnus@enger.priv.no> 2011-04-07 14:31:07 UTC --- Created attachment 3805 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=3805 Signed-off patch Behaves as expected. Also tested with notices. -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5431 Magnus Enger <magnus@enger.priv.no> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |magnus@enger.priv.no Patch Status|Pushed For QA |Signed Off -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5431 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch Status|Signed Off |Patch Pushed --- Comment #9 from Chris Cormack <chris@bigballofwax.co.nz> 2011-04-09 00:08:54 UTC --- PAtch pushed, please test -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5431 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch Status|Patch Pushed |Needs Signoff --- Comment #10 from Chris Cormack <chris@bigballofwax.co.nz> 2011-04-11 04:30:34 UTC --- Bug with ModBranch, please test and signoff the follow up patch -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5431 --- Comment #11 from Chris Cormack <chris@bigballofwax.co.nz> 2011-04-11 04:36:42 UTC --- Created attachment 3855 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=3855 Follow up patch -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5431 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #3855|0 |1 is obsolete| | --- Comment #12 from Katrin Fischer <katrin.fischer@bsz-bw.de> 2011-04-11 20:39:19 UTC --- Created attachment 3885 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=3885 Signed off patch -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5431 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch Status|Needs Signoff |Signed Off -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5431 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch Status|Signed Off |Patch Pushed --- Comment #13 from Chris Cormack <chris@bigballofwax.co.nz> 2011-04-11 20:57:52 UTC --- Follow up patch pushed -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5431 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution| |FIXED -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org