From 2222521dccd2cd2519924426dc1200be7bd030f7 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Thu, 1 Nov 2018 14:13:48 +0000 Subject: [PATCH] Bug 21794: Show address information on patron details tab if incomplete To test: - Enter 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 - Toggly AddressFormat and check display is correct for all settings --- .../prog/en/includes/member-display-address-style-de.inc | 4 ++-- .../prog/en/includes/member-display-address-style-fr.inc | 4 ++-- .../prog/en/includes/member-display-address-style-us.inc | 2 +- .../prog/en/includes/member-display-alt-address-style-de.inc | 4 ++-- .../prog/en/includes/member-display-alt-address-style-fr.inc | 2 +- .../prog/en/includes/member-display-alt-address-style-us.inc | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-de.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-de.inc index 78e0388e40..dbb011de45 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-de.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-de.inc @@ -10,7 +10,7 @@
  • [% patron.address2 | html %]
    • [% END %] [% END %] -[% IF ( patron.city ) %]
  • - [%IF ( patron.zipcode ) %][% patron.zipcode | html %] [% END %][% patron.city | html %][% IF ( patron.state ) %]
    [% patron.state | html %][% END %] +[% IF ( patron.city || patron.state || patron.zipcode || patron.country ) %]
  • + [% IF ( patron.zipcode ) %][% patron.zipcode | html %] [% END %][% patron.city | html %][% IF ( patron.state ) %]
    [% patron.state | html %][% END %] [% IF ( patron.country ) %]
    [% patron.country | html %][% END %]
    • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc index cd8cb48922..70306d86b1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc @@ -13,7 +13,7 @@
  • [% patron.address2 | html %]
    • [% END %] [% END %] -[% IF ( patron.city ) %] -
  • [%IF ( patron.zipcode ) %][% patron.zipcode | html %] [% END %][% patron.city | html %][% IF ( patron.state ) %]
    [% patron.state | html %][% END %] +[% IF ( patron.city || patron.state || patron.zipcode || patron.country ) %]
  • + [%IF ( patron.zipcode ) %][% patron.zipcode | html %] [% END %][% patron.city | html %][% IF ( patron.state ) %]
    [% patron.state | html %][% END %] [% IF ( patron.country ) %]
    [% patron.country | html %][% END %]
    • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-us.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-us.inc index 7b00bddca8..403c103d87 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-us.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-us.inc @@ -10,7 +10,7 @@
  • [% patron.address2 |html %]
    • [% END %] [% END %] -[% IF ( patron.city ) %]
  • +[% IF ( patron.city || patron.state || patron.zipcode || patron.country ) %]
  • [% patron.city |html %][% IF ( patron.state ) %], [% patron.state |html %][% END %] [% patron.zipcode |html %][% IF ( patron.country ) %], [% patron.country |html %][% END %]
    • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-de.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-de.inc index f7fc9748c9..ebab1c979c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-de.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-de.inc @@ -10,7 +10,7 @@
  • [% patron.B_address2 | html %]
    • [% END %] [% END %] -[% IF ( patron.B_city ) %]
  • - [%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_city || patron.B_state || patron.B_zipcode || patron.B_country ) %]
  • + [% 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 %]
    • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-fr.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-fr.inc index 2080a48885..7217aed71f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-fr.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-fr.inc @@ -13,7 +13,7 @@
  • [% patron.B_address2 | html %]
    • [% END %] [% END %] -[% IF ( patron.B_city ) %] +[% IF ( patron.B_city || patron.B_state || patron.B_zipcode || patron.B_country ) %]
  • [%IF ( patron.B_zipcode ) %][% patron.B_zipcode | html %] [% END %] [% patron.B_city | html %] [% IF ( patron.B_state ) %]
    [% patron.B_state | html %][% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-us.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-us.inc index 9f8453f508..8ff2bc87fe 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-us.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-us.inc @@ -10,7 +10,7 @@
  • [% patron.B_address2 | html %]
    • [% END %] [% END %] -[% IF ( patron.B_city ) %]
  • - [% 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 %]
    • +[% IF ( patron.B_city || patron.B_state || patron.B_zipcode || patron.B_country ) %]
  • + [% 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 %]
    • [% END %] -- 2.11.0