|
Description
Victor Pang
2013-08-19 12:05:25 UTC
Still valid. Created attachment 52351 [details] [review] Bug 10760: Alternate Address: Make street number and street type editable Table 'borrowers' contain columns B_streetnumber and B_streettype. This patch makes them editable for alternate address. To test: - Apply patch - Edit a patron's details - Verify that in edit mode for Alternate address, the fields 'street type' and 'street number' appear and follow the settings in sysprefs AddressFormat, BorrowerMandatoryField, BorrowerUnwantedField - Verify that the values are saved correctly. Note: A second patch will follow to manage the display of street number and street type Created attachment 52352 [details] [review] Bug 10760: Alternate Address: Display street number and street type This patch displays alternate streetnumber and street type on patron's detail page. To test: - Apply patch - Verify that the alternate address information displays follwing the setting in syspref AddressFormat and contains street type and street number (as appropriate) Comment on attachment 52352 [details] [review] Bug 10760: Alternate Address: Display street number and street type Review of attachment 52352 [details] [review]: ----------------------------------------------------------------- ::: koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ +413,5 @@ > <div id="patron-alternate-address" style="padding-top: 1em;"> > <h3>Alternate address</h3> > + > + [% IF Koha.Preference( 'AddressFormat' ) %] > + [% INCLUDE "member-display-alt-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %] What if the file doesn't exist? (In reply to M. Tompsett from comment #4) > Comment on attachment 52352 [details] [review] [review] > Bug 10760: Alternate Address: Display street number and street type > > Review of attachment 52352 [details] [review] [review]: > ----------------------------------------------------------------- > > ::: koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt > @@ +413,5 @@ > > <div id="patron-alternate-address" style="padding-top: 1em;"> > > <h3>Alternate address</h3> > > + > > + [% IF Koha.Preference( 'AddressFormat' ) %] > > + [% INCLUDE "member-display-alt-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %] > > What if the file doesn't exist? It works the same as with Bug 4041 - Address Format as a I18N/L10N system preference and Bug 16730 - Use member-display-address-style*-includes in moremember-brief.tt Syspref 'AddressFormat' can have 2 values: us and de ----snip--- - pref: addressformat default: us choices: us: US style ([Street number], [Address] - [City], [Zip/Postal Code], [Country]) de: German style ([Adress] [Street number] - [Zip/Postal Code] [City] - [Country] ----snip--- For each choice, a file exists: member-display-alt-address-style-us.inc member-display-alt-address-style-de.inc Fallback is us if syspref 'AdressFormat' is not defined If more formats are needed, you have to - add an additional syspref value - add inc files to folder koha-tmpl/intranet-tmpl/prog/en/includes as appropriate Thx for the explanation Marc - looks ok to me. The format for US addresses should be: [Street number] [Address] [Road type] Correct: 25 Euclid Drive Incorrect: 25 Drive Euclid Created attachment 52595 [details] [review] Bug 10760: (followup) Move street type after address As of comment #7 (In reply to Owen Leonard from comment #7) > The format for US addresses should be: > > [Street number] [Address] [Road type] > > Correct: 25 Euclid Drive > Incorrect: 25 Drive Euclid Same issue with main address (introduced by Bug 4041), see Bug 16779 Created attachment 52598 [details] [review] [SIGNED-OFF] Bug 10760: Alternate Address: Make street number and street type editable Table 'borrowers' contain columns B_streetnumber and B_streettype. This patch makes them editable for alternate address. To test: - Apply patch - Edit a patron's details - Verify that in edit mode for Alternate address, the fields 'street type' and 'street number' appear and follow the settings in sysprefs AddressFormat, BorrowerMandatoryField, BorrowerUnwantedField - Verify that the values are saved correctly. Note: A second patch will follow to manage the display of street number and street type Signed-off-by: Owen Leonard <oleonard@myacpl.org> Created attachment 52599 [details] [review] [SIGNED-OFF] Bug 10760: Alternate Address: Display street number and street type This patch displays alternate streetnumber and street type on patron's detail page. To test: - Apply patch - Verify that the alternate address information displays follwing the setting in syspref AddressFormat and contains street type and street number (as appropriate) Signed-off-by: Owen Leonard <oleonard@myacpl.org> Created attachment 52600 [details] [review] [SIGNED-OFF] Bug 10760: (followup) Move street type after address As of comment #7 Signed-off-by: Owen Leonard <oleonard@myacpl.org> *** Bug 13996 has been marked as a duplicate of this bug. *** Created attachment 52829 [details] [review] Bug 10760: Alternate Address: Make street number and street type editable Table 'borrowers' contain columns B_streetnumber and B_streettype. This patch makes them editable for alternate address. To test: - Apply patch - Edit a patron's details - Verify that in edit mode for Alternate address, the fields 'street type' and 'street number' appear and follow the settings in sysprefs AddressFormat, BorrowerMandatoryField, BorrowerUnwantedField - Verify that the values are saved correctly. Note: A second patch will follow to manage the display of street number and street type Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Created attachment 52830 [details] [review] Bug 10760: Alternate Address: Display street number and street type This patch displays alternate streetnumber and street type on patron's detail page. To test: - Apply patch - Verify that the alternate address information displays follwing the setting in syspref AddressFormat and contains street type and street number (as appropriate) Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Created attachment 52831 [details] [review] Bug 10760: (followup) Move street type after address As of comment #7 Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Pushed to master for 16.11, thanks Marc! Pushed in 16.05. Will be in 16.05.02. |