From 72e5f6fa2f7e49bc423957846228038f3eb20015 Mon Sep 17 00:00:00 2001 From: David Cook Date: Mon, 14 Jan 2013 16:37:26 +1100 Subject: [PATCH] Bug 9383 - Bad logic, missing params, and irregular labeling for Members scripts Content-Type: text/plain; charset="utf-8" Before Patch: 1) Category_type not being passed from moremember.pl to applicable templates 2) Logic in moremembers.pl doesn't work without category_type param. However, with the param, it runs category_type conditions one after another (if/else, if/else), rather than nesting them (if/elsif/else), which creates duplicate data for the P category type. 3) Labels are inconsistent between memberentrygen.pl page and moremember.pl page --- After Patch: 1) Category_type is passed to moremember.tt and moremember-brief.tt 2) Conditions based on category_type are nested, so as to exploit an if/elsif/else structure that prevents incorrect data being printed. 3) Labels are now consistent between moremember.pl and memberentrygen.pl. --- .../prog/en/modules/members/memberentrygen.tt | 18 ++++++++++++---- .../prog/en/modules/members/moremember-brief.tt | 17 +++++++-------- .../prog/en/modules/members/moremember.tt | 21 +++++++++---------- members/moremember.pl | 1 + 4 files changed, 32 insertions(+), 25 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index e327d03..5766c12 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -595,7 +595,11 @@ [% ELSE %] + [% IF ( I ) %] + Organization phone: + [% ELSE %] + Primary phone: + [% END %] [% IF ( opduplicate ) %] [% ELSE %] @@ -605,7 +609,7 @@ [% END %] - [% UNLESS nophonepro %] + [% UNLESS nophonepro || I %]
  • [% IF ( mandatoryphonepro ) %]
  • [% END %] - [% UNLESS nomobile %] + [% UNLESS nomobile || I || P %]
  • [% IF ( mandatorymobile ) %] [% IF ( opduplicate ) %] [% ELSE %] @@ -654,7 +662,7 @@
  • [% END %] - [% UNLESS noemailpro %] + [% UNLESS noemailpro || I %]
  • [% IF ( mandatoryemailpro ) %]