From 2bd123f5ba863138a298ac90e3ccc4e9f3a78dc4 Mon Sep 17 00:00:00 2001 From: Brendon Ford Date: Thu, 12 Jun 2014 20:28:28 -0400 Subject: [PATCH] Bug 12407: phone label or data switched Fix for switched phone numbers on patron details page. This patch fixes switched phone numbers on patron details page and also makes phone number labels more uniform. To Test: 1. Apply the patch. 2. Create/modify a patron entering some unique data into the "Secondary phone:" and "Other phone:" fields (different data for each). 3. Save the patron record. 4. Go to the patrons details page and make sure the data entered into the "Secondary phone:" field is displaying next to the "Secondary phone:" label and that the data entered into the "Other phone:" field is displaying next to the "Other phone:" label. Signed-off-by: Nicole C. Engard Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi --- .../prog/en/modules/members/moremember-brief.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/members/moremember.tt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt index c9fb845fef..b46424e71a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt @@ -33,13 +33,13 @@ [% IF ( emailpro ) %]
  • Organization email: [% emailpro %]
    • [% END %] [% ELSE %] [% IF ( phone ) %]
  • Primary phone: [% phone %]
    • [% END %] - [% IF ( mobile ) %]
  • Secondary phone: [% mobile %]
    • [% END %] - [% IF ( phonepro ) %]
  • Other phone: [% phonepro %]
    • [% END %] + [% IF ( phonepro ) %]
  • Secondary phone: [% phonepro %]
    • [% END %] + [% IF ( mobile ) %]
  • Other phone: [% mobile %]
    • [% END %] [% END %] [% IF ( P ) %] [% IF ( phone ) %]
  • Primary phone: [% phone %]
    • [% END %] - [% IF ( mobile ) %]
  • Secondary mobile: [% mobile %]
    • [% END %] + [% IF ( mobile ) %]
  • Other phone: [% mobile %]
    • [% END %] [% END %] [% IF ( fax ) %]
  • Fax: [% fax %]
    • [% END %] [% UNLESS ( I ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index e557fc3181..203c37f1a3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -191,13 +191,13 @@ function validate1(date) { [% IF ( emailpro ) %]
  • Organization email: [% emailpro %]
    • [% END %] [% ELSE %] [% IF ( phone ) %]
  • Primary phone: [% phone %]
    • [% END %] - [% IF ( mobile ) %]
  • Secondary phone: [% mobile %]
    • [% END %] - [% IF ( phonepro ) %]
  • Other phone: [% phonepro %]
    • [% END %] + [% IF ( phonepro ) %]
  • Secondary phone: [% phonepro %]
    • [% END %] + [% IF ( mobile ) %]
  • Other phone: [% mobile %]
    • [% END %] [% END %] [% IF ( P ) %] [% IF ( phone ) %]
  • Primary phone: [% phone %]
    • [% END %] - [% IF ( mobile ) %]
  • Secondary phone: [% mobile %]
    • [% END %] + [% IF ( mobile ) %]
  • Other phone: [% mobile %]
    • [% END %] [% END %] [% IF ( fax ) %]
  • Fax: [% fax %]
    • [% END %] [% UNLESS ( I ) %] -- 2.39.2