Bugzilla – Attachment 124512 Details for
Bug 21794
Incomplete address displayed on patron details page when City field is empty
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21794: (QA follow-up) Separate city and country with a comma
Bug-21794-QA-follow-up-Separate-city-and-country-w.patch (text/plain), 2.95 KB, created by
Joonas Kylmälä
on 2021-09-04 18:29:33 UTC
(
hide
)
Description:
Bug 21794: (QA follow-up) Separate city and country with a comma
Filename:
MIME Type:
Creator:
Joonas Kylmälä
Created:
2021-09-04 18:29:33 UTC
Size:
2.95 KB
patch
obsolete
>From e41e2cae5ee73c043001b844f05a894f050b44d5 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Joonas=20Kylm=C3=A4l=C3=A4?= <joonas.kylmala@iki.fi> >Date: Sat, 4 Sep 2021 18:23:16 +0000 >Subject: [PATCH] Bug 21794: (QA follow-up) Separate city and country with a > comma >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >If only the city and country address information was provided they ended >up being glued together like this: CityCountry. (AddressFormat=US style) > >Signed-off-by: Joonas Kylmälä <joonas.kylmala@iki.fi> >--- > .../prog/en/includes/member-display-address-style.inc | 2 +- > .../prog/en/includes/member-display-alt-address-style.inc | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc >index a79532b5cd..83fa575bd1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc >@@ -26,7 +26,7 @@ > [%~ IF ( patron.city || patron.zipcode || patron.state || patron.country ) ~%] > <li class="patroncity"> > [%~ 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 ~%] >+ [%~ IF ( patron.zipcode ) %][%~ " " _ patron.zipcode |html ~%][% END %][%~ IF ( patron.country ) %][%~ IF ( patron.zipcode || patron.state || patron.city ) ~%], [% END ~%][% patron.country |html ~%][%~ END ~%] > </li> > [%~ END ~%] > [%~ END ~%] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style.inc >index 57b7d05222..dfcb607424 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style.inc >@@ -23,7 +23,7 @@ > [% IF ( patron.B_city || patron.B_state || patron.B_country || patron.B_zipcode ) %] > <li class="patroncity"> > [% 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 %] >+ [% IF ( patron.B_zipcode ) %][%~ " " _ patron.B_zipcode |html ~%][% END %][% IF ( patron.B_country ) %][% IF ( patron.B_zipcode || patron.B_state || patron.B_city ) %], [% END %][% patron.B_country | html %][% END %] > </li> > [% END %] > [% END %] >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 21794
:
82136
|
124055
|
124442
|
124511
| 124512