[Bug 25070] New: Include files to display address and contact must be refactored
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Bug ID: 25070 Summary: Include files to display address and contact must be refactored Change sponsored?: --- Product: Koha Version: unspecified Hardware: All OS: All Status: ASSIGNED Severity: enhancement Priority: P5 - low Component: Architecture, internals, and plumbing Assignee: jonathan.druart@bugs.koha-community.org Reporter: jonathan.druart@bugs.koha-community.org QA Contact: testopia@bugs.koha-community.org There are 5 includes files per value of AddressFormat (us, de, fr). The code is duplicated for each language, the only thing that changes is the order. A refactoring is needed to avoid further regressions. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |18110, 4041 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=4041 [Bug 4041] Address Format as a I18N/L10N system preference https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18110 [Bug 18110] Adds FR to the syspref AddressFormat -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |25069 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25069 [Bug 25069] AddressFormat="fr" behavior is broken -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 --- Comment #1 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 102439 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=102439&action=edit Bug 25070: Centralize member-alt-address-style There are 5 includes files per value of AddressFormat (us, de, fr). The code is duplicated for each language, the only thing that changes is the order. Wwith this patchset we are going to refactore them to avoid further regressions. The idea is to remove all code that is duplicated and remove the need of having 5*3 files. We are going to limit them to 5 files, 1 per use. Note that we could go even further, for instance member-display-alt-address-style and member-display-address-style are quite identical. Test plan (for the whole patchset): - Create a patron with all the address, contact and alternate info filled - Edit them and save - Look at the patron's info (top left) in the patron module, and the patron detail view. - Play with the different values of AddressFormat The order and the info must be displayed identically before and after this patchset. No change is expected. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 --- Comment #2 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 102440 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=102440&action=edit Bug 25070: Centralize member-alt-contact-style -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 --- Comment #3 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 102441 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=102441&action=edit Bug 25070: Centralize member-display-address-style -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 --- Comment #4 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 102442 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=102442&action=edit Bug 25070: Centralize member-display-alt-address-style -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 --- Comment #5 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 102443 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=102443&action=edit Bug 25070: Centralize member-main-address-style -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |22087 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=22087 [Bug 22087] It would be helpful to have City and State visible in member.pl -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #102439|0 |1 is obsolete| | Attachment #102440|0 |1 is obsolete| | Attachment #102441|0 |1 is obsolete| | Attachment #102442|0 |1 is obsolete| | Attachment #102443|0 |1 is obsolete| | --- Comment #6 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 102477 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=102477&action=edit Bug 25070: Centralize member-alt-address-style There are 5 includes files per value of AddressFormat (us, de, fr). The code is duplicated for each language, the only thing that changes is the order. Wwith this patchset we are going to refactore them to avoid further regressions. The idea is to remove all code that is duplicated and remove the need of having 5*3 files. We are going to limit them to 5 files, 1 per use. Note that we could go even further, for instance member-display-alt-address-style and member-display-address-style are quite identical. Test plan (for the whole patchset): - Create a patron with all the address, contact and alternate info filled - Edit them and save - Look at the patron's info (top left) in the patron module, and the patron detail view. - Play with the different values of AddressFormat The order and the info must be displayed identically before and after this patchset. No change is expected. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 --- Comment #7 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 102478 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=102478&action=edit Bug 25070: Centralize member-alt-contact-style -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 --- Comment #8 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 102479 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=102479&action=edit Bug 25070: Centralize member-display-address-style -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 --- Comment #9 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 102480 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=102480&action=edit Bug 25070: Centralize member-display-alt-address-style -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 --- Comment #10 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 102481 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=102481&action=edit Bug 25070: Centralize member-main-address-style -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #102477|0 |1 is obsolete| | Attachment #102478|0 |1 is obsolete| | Attachment #102479|0 |1 is obsolete| | Attachment #102480|0 |1 is obsolete| | Attachment #102481|0 |1 is obsolete| | --- Comment #11 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 102487 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=102487&action=edit Bug 25070: Centralize member-alt-address-style There are 5 includes files per value of AddressFormat (us, de, fr). The code is duplicated for each language, the only thing that changes is the order. Wwith this patchset we are going to refactore them to avoid further regressions. The idea is to remove all code that is duplicated and remove the need of having 5*3 files. We are going to limit them to 5 files, 1 per use. Note that we could go even further, for instance member-display-alt-address-style and member-display-address-style are quite identical. Test plan (for the whole patchset): - Create a patron with all the address, contact and alternate info filled - Edit them and save - Look at the patron's info (top left) in the patron module, and the patron detail view. - Play with the different values of AddressFormat The order and the info must be displayed identically before and after this patchset. No change is expected. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 --- Comment #12 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 102488 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=102488&action=edit Bug 25070: Centralize member-alt-contact-style -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 --- Comment #13 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 102489 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=102489&action=edit Bug 25070: Centralize member-display-address-style -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 --- Comment #14 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 102490 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=102490&action=edit Bug 25070: Centralize member-display-alt-address-style -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 --- Comment #15 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 102491 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=102491&action=edit Bug 25070: Centralize member-main-address-style -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |david@davidnind.com Status|Needs Signoff |Patch doesn't apply --- Comment #16 from David Nind <david@davidnind.com> --- Patch doesn't apply 8-( root@34d7e7da5f3f:koha(bz25070)$ git bz apply 25070 Bug 25070 - Include files to display address and contact must be refactored 102487 - Bug 25070: Centralize member-alt-address-style 102488 - Bug 25070: Centralize member-alt-contact-style 102489 - Bug 25070: Centralize member-display-address-style 102490 - Bug 25070: Centralize member-display-alt-address-style 102491 - Bug 25070: Centralize member-main-address-style Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 25070: Centralize member-alt-address-style Applying: Bug 25070: Centralize member-alt-contact-style Applying: Bug 25070: Centralize member-display-address-style Applying: Bug 25070: Centralize member-display-alt-address-style Applying: Bug 25070: Centralize member-main-address-style Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc M koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc M koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc M koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt CONFLICT (modify/delete): koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc deleted in Bug 25070: Centralize member-main-address-style and modified in HEAD. Version HEAD of koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc left in tree. CONFLICT (modify/delete): koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc deleted in Bug 25070: Centralize member-main-address-style and modified in HEAD. Version HEAD of koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc left in tree. CONFLICT (modify/delete): koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc deleted in Bug 25070: Centralize member-main-address-style and modified in HEAD. Version HEAD of koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc left in tree. error: Failed to merge in the changes. Patch failed at 0001 Bug 25070: Centralize member-main-address-style -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #102487|0 |1 is obsolete| | Attachment #102488|0 |1 is obsolete| | Attachment #102489|0 |1 is obsolete| | Attachment #102490|0 |1 is obsolete| | Attachment #102491|0 |1 is obsolete| | --- Comment #17 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 104562 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=104562&action=edit Bug 25070: Centralize member-alt-address-style There are 5 includes files per value of AddressFormat (us, de, fr). The code is duplicated for each language, the only thing that changes is the order. Wwith this patchset we are going to refactore them to avoid further regressions. The idea is to remove all code that is duplicated and remove the need of having 5*3 files. We are going to limit them to 5 files, 1 per use. Note that we could go even further, for instance member-display-alt-address-style and member-display-address-style are quite identical. Test plan (for the whole patchset): - Create a patron with all the address, contact and alternate info filled - Edit them and save - Look at the patron's info (top left) in the patron module, and the patron detail view. - Play with the different values of AddressFormat The order and the info must be displayed identically before and after this patchset. No change is expected. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 --- Comment #18 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 104563 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=104563&action=edit Bug 25070: Centralize member-alt-contact-style -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 --- Comment #19 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 104564 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=104564&action=edit Bug 25070: Centralize member-display-address-style -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 --- Comment #20 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 104565 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=104565&action=edit Bug 25070: Centralize member-display-alt-address-style -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 --- Comment #21 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 104566 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=104566&action=edit Bug 25070: Centralize member-main-address-style -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 --- Comment #22 from David Nind <david@davidnind.com> --- I'm getting an error when I go to add a new patron - hope this enough of the error trace: Template process failed: file error - member-alt-contact-style-us: not found at /kohadevbox/koha/C4/Templates.pm line 122 in C4::Templates::output at /kohadevbox/koha/C4/Templates.pm line 122 119: 120: my $data; 121: binmode( STDOUT, ":utf8" ); 122: $template->process( $self->filename, $vars, \$data ) 123: || die "Template process failed: ", $template->error(); 124: return $data; 125: } Show function arguments in (eval) at /kohadevbox/koha/members/memberentry.pl line 86 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |ASSIGNED --- Comment #23 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Hum, I reused patches from a local branch, I should have not apparently :-/ -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #104566|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #104565|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #104564|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #104563|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #104562|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #102491|1 |0 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #102490|1 |0 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #102489|1 |0 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #102488|1 |0 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #102487|1 |0 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #102487|0 |1 is obsolete| | Attachment #102488|0 |1 is obsolete| | Attachment #102489|0 |1 is obsolete| | Attachment #102490|0 |1 is obsolete| | Attachment #102491|0 |1 is obsolete| | --- Comment #24 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 104581 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=104581&action=edit Bug 25070: Centralize member-alt-address-style There are 5 includes files per value of AddressFormat (us, de, fr). The code is duplicated for each language, the only thing that changes is the order. Wwith this patchset we are going to refactore them to avoid further regressions. The idea is to remove all code that is duplicated and remove the need of having 5*3 files. We are going to limit them to 5 files, 1 per use. Note that we could go even further, for instance member-display-alt-address-style and member-display-address-style are quite identical. Test plan (for the whole patchset): - Create a patron with all the address, contact and alternate info filled - Edit them and save - Look at the patron's info (top left) in the patron module, and the patron detail view. - Play with the different values of AddressFormat The order and the info must be displayed identically before and after this patchset. No change is expected. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 --- Comment #25 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 104582 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=104582&action=edit Bug 25070: Centralize member-alt-contact-style -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 --- Comment #26 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 104583 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=104583&action=edit Bug 25070: Centralize member-display-address-style -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 --- Comment #27 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 104584 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=104584&action=edit Bug 25070: Centralize member-display-alt-address-style -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 --- Comment #28 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 104585 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=104585&action=edit Bug 25070: Centralize member-main-address-style -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 --- Comment #29 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Sorry David, it should be ok now. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 --- Comment #30 from David Nind <david@davidnind.com> --- (In reply to Jonathan Druart from comment #29)
Sorry David, it should be ok now.
Thanks Jonathan - it all works now! Two things I noted: 1) Alternative address section: the email address displays as empty on the patron details page, even though it has a value. 2) Alternative contact section: the address displays with each field listed, rather than as an address block like the contact information and alternative address sections. As both of these reflect the current behaviour, I'm not sure whether you want to fix these in this bug or do separately. Apart from those two points, everything seems to work and I'm happy to sign off. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 --- Comment #31 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- We should fix them on a separate bug report, to make the bug fixes easily backportable. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |https://bugs.koha-community | |.org/bugzilla3/show_bug.cgi | |?id=25452 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 --- Comment #32 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- (In reply to David Nind from comment #30) I have fixed:
1) Alternative address section: the email address displays as empty on the patron details page, even though it has a value.
on bug 25452. I let you open a bug report for the second remark ;) -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #104581|0 |1 is obsolete| | --- Comment #33 from David Nind <david@davidnind.com> --- Created attachment 104659 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=104659&action=edit Bug 25070: Centralize member-alt-address-style There are 5 includes files per value of AddressFormat (us, de, fr). The code is duplicated for each language, the only thing that changes is the order. Wwith this patchset we are going to refactore them to avoid further regressions. The idea is to remove all code that is duplicated and remove the need of having 5*3 files. We are going to limit them to 5 files, 1 per use. Note that we could go even further, for instance member-display-alt-address-style and member-display-address-style are quite identical. Test plan (for the whole patchset): - Create a patron with all the address, contact and alternate info filled - Edit them and save - Look at the patron's info (top left) in the patron module, and the patron detail view. - Play with the different values of AddressFormat The order and the info must be displayed identically before and after this patchset. No change is expected. Signed-off-by: David Nind <david@davidnind.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #104582|0 |1 is obsolete| | --- Comment #34 from David Nind <david@davidnind.com> --- Created attachment 104660 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=104660&action=edit Bug 25070: Centralize member-alt-contact-style Signed-off-by: David Nind <david@davidnind.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #104583|0 |1 is obsolete| | --- Comment #35 from David Nind <david@davidnind.com> --- Created attachment 104661 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=104661&action=edit Bug 25070: Centralize member-display-address-style Signed-off-by: David Nind <david@davidnind.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #104584|0 |1 is obsolete| | --- Comment #36 from David Nind <david@davidnind.com> --- Created attachment 104662 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=104662&action=edit Bug 25070: Centralize member-display-alt-address-style Signed-off-by: David Nind <david@davidnind.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #104585|0 |1 is obsolete| | --- Comment #37 from David Nind <david@davidnind.com> --- Created attachment 104663 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=104663&action=edit Bug 25070: Centralize member-main-address-style Signed-off-by: David Nind <david@davidnind.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 --- Comment #38 from David Nind <david@davidnind.com> --- (In reply to Jonathan Druart from comment #32)
I let you open a bug report for the second remark ;)
Bug 25463 opened. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords| |rel_20_05_candidate -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |25463 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25463 [Bug 25463] Patron details page - display the alternative contact address as a block -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |martin.renvoize@ptfs-europe | |.com Keywords|rel_20_05_candidate |rel_20_11_target -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- QA Contact|testopia@bugs.koha-communit |katrin.fischer@bsz-bw.de |y.org | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch complexity|--- |Small patch Status|Signed Off |Passed QA -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #104659|0 |1 is obsolete| | --- Comment #39 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 105745 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=105745&action=edit Bug 25070: Centralize member-alt-address-style There are 5 includes files per value of AddressFormat (us, de, fr). The code is duplicated for each language, the only thing that changes is the order. Wwith this patchset we are going to refactore them to avoid further regressions. The idea is to remove all code that is duplicated and remove the need of having 5*3 files. We are going to limit them to 5 files, 1 per use. Note that we could go even further, for instance member-display-alt-address-style and member-display-address-style are quite identical. Test plan (for the whole patchset): - Create a patron with all the address, contact and alternate info filled - Edit them and save - Look at the patron's info (top left) in the patron module, and the patron detail view. - Play with the different values of AddressFormat The order and the info must be displayed identically before and after this patchset. No change is expected. Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #104660|0 |1 is obsolete| | --- Comment #40 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 105746 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=105746&action=edit Bug 25070: Centralize member-alt-contact-style Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #104661|0 |1 is obsolete| | --- Comment #41 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 105747 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=105747&action=edit Bug 25070: Centralize member-display-address-style Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #104662|0 |1 is obsolete| | --- Comment #42 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 105748 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=105748&action=edit Bug 25070: Centralize member-display-alt-address-style Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #104663|0 |1 is obsolete| | --- Comment #43 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 105749 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=105749&action=edit Bug 25070: Centralize member-main-address-style Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 --- Comment #44 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 105750 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=105750&action=edit Bug 25070: (QA follow-up) Fix capitalization: Street Number Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to master Version(s)| |20.11.00 released in| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 --- Comment #45 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Pushed to master for 20.11, thanks to everybody involved! -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Lucas Gass <lucas@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |lucas@bywatersolutions.com Status|Pushed to master |Pushed to stable Version(s)|20.11.00 |20.11.00, 20.05.01 released in| | --- Comment #46 from Lucas Gass <lucas@bywatersolutions.com> --- backported to 20.05.x for 20.05.01 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Aleisha Amohia <aleisha@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |aleisha@catalyst.net.nz --- Comment #47 from Aleisha Amohia <aleisha@catalyst.net.nz> --- enhancement, not backported to 19.11.x -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Fridolin SOMERS <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |25839 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25839 [Bug 25839] Typo patron.streetype in member-main-address-style.inc -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |25842 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25842 [Bug 25842] Typo "streetype" in member-main-address-style.inc -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Text to go in the| |This internal change release notes| |simplifies the code for | |editing and displaying | |patron address and contact | |information. It removes | |duplicated code, reducing | |potential problems when the | |code is changed in the | |future. | | | |For example, there | |are currently 5 include | |files for each value of the | |address format (us, de, fr) | |with the code duplicated | |for each language. The | |change reduces the need for | |5*3 files to 5 files. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Fridolin SOMERS <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |26556 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26556 [Bug 26556] Cities autocomplete broken in patron edition -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords|rel_20_11_target | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25070 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |29213 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29213 [Bug 29213] Typo ol in member-alt-contact-style.inc -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org