@@ -, +, @@
when city is empty
- Enter main contact and alternate address without city
- Verify that the address information isn't shown on the details
tab after saving
- Apply patch
- Verify that the information is displayed now
- Toggle AddressFormat and check display is correct for all settings
- Switch back to US address format
- Try several combinations of empty fields for city, zipcode, country
and state. The punctuation and whitespace should always appear
correctly.
- Enter just country
- Enter zipcode and country
- ...
---
.../prog/en/includes/member-display-address-style.inc | 10 +++++-----
.../prog/en/includes/member-display-alt-address-style.inc | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc
@@ -23,10 +23,10 @@
[%~ patron.address2 |html ~%]
[%~ END ~%]
[%~ END ~%]
- [%~ IF ( patron.city ) ~%]
+ [%~ IF ( patron.city || patron.zipcode || patron.state || patron.country ) ~%]
- [%~ patron.city |html ~%][%~ IF ( patron.state ) %], [% patron.state |html ~%][%~ END ~%]
- [%~ " " _ patron.zipcode |html ~%][%~ IF ( patron.country ) %], [% patron.country |html ~%][%~ END ~%]
+ [%~ patron.city |html ~%][%~ IF ( patron.state ) %][%~ IF ( patron.city ) ~%], [% END ~%][% patron.state |html ~%][%~ END ~%]
+ [%~ IF ( patron.zipcode ) %][%~ " " _ patron.zipcode |html ~%][% END %][%~ IF ( patron.country ) %][%~ IF ( patron.zipcode || patron.state ) ~%], [% END ~%][% patron.country |html ~%][%~ END ~%]
[%~ END ~%]
[%~ END ~%]
@@ -44,7 +44,7 @@
[%~ patron.address2 | html ~%]
[%~ END ~%]
[%~ END ~%]
- [%~ IF ( patron.city ) ~%]
+ [%~ IF ( patron.city || patron.zipcode || patron.state || patron.country ) ~%]
[%~ IF ( patron.zipcode ) ~%][%~ patron.zipcode | html %] [% END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%][% line_break | $raw %][%~ patron.state | html ~%][%~ END ~%]
[%~ IF ( patron.country ) ~%][% line_break | $raw %][%~ patron.country | html ~%][%~ END ~%]
@@ -68,7 +68,7 @@
[%~ patron.address2 | html ~%]
[%~ END ~%]
[%~ END ~%]
- [%~ IF ( patron.city ) ~%]
+ [%~ IF ( patron.city || patron.zipcode || patron.state || patron.country ) ~%]
[%~ IF ( patron.zipcode ) ~%][%~ patron.zipcode | html %] [% END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%][% line_break | $raw %][%~ patron.state | html ~%][%~ END ~%]
[%~ IF ( patron.country ) ~%][% line_break | $raw %][%~ patron.country | html ~%][%~ END ~%]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style.inc
@@ -20,10 +20,10 @@
[% patron.B_address2 | html %]
[% END %]
[% END %]
- [% IF ( patron.B_city ) %]
+ [% IF ( patron.B_city || patron.B_state || patron.B_country || patron.B_zipcode ) %]
- [% patron.B_city | html %][% IF ( patron.B_state ) %], [% patron.B_state | html %][% END %]
- [% patron.B_zipcode | html %][% IF ( patron.B_country ) %], [% patron.B_country | html %][% END %]
+ [% patron.B_city | html %][% IF ( patron.B_state ) %][% IF ( patron.B_city ) %], [% END %][%~ patron.B_state | html ~%][%~ END ~%]
+ [% IF ( patron.B_zipcode ) %][%~ " " _ patron.B_zipcode |html ~%][% END %][% IF ( patron.B_country ) %][% IF ( patron.B_zipcode || patron.B_state ) %], [% END %][% patron.B_country | html %][% END %]
[% END %]
[% END %]
@@ -41,7 +41,7 @@
[% patron.B_address2 | html %]
[% END %]
[% END %]
- [% IF ( patron.B_city ) %]
+ [% IF ( patron.B_city || patron.B_state || patron.B_country || patron.B_zipcode ) %]
[%IF ( patron.B_zipcode ) %][% patron.B_zipcode | html %] [% END %][% patron.B_city | html %][% IF ( patron.B_state ) %][% patron.B_state | html %][% END %]
[% IF ( patron.B_country ) %]
[% patron.B_country | html %][% END %]
@@ -65,7 +65,7 @@
[% patron.B_address2 | html %]
[% END %]
[% END %]
- [% IF ( patron.B_city ) %]
+ [% IF ( patron.B_city || patron.B_state || patron.B_country || patron.B_zipcode ) %]
[%IF ( patron.B_zipcode ) %][% patron.B_zipcode | html %] [% END %]
[% patron.B_city | html %]
--