From 28073339eb4a0ae5faec610b1db7532e40f1dbe6 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. --- .../intranet-tmpl/prog/en/modules/members/moremember-brief.tt | 6 +++--- koha-tmpl/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 c9fb845..b46424e 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 345c728..d42ae59 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -225,13 +225,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 ) %] -- 1.7.10.4