From 9e4f87c93452f2e0537524e318448a7212e37736 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 10 Aug 2011 14:58:12 -0400 Subject: [PATCH] Fix for Bug 6698, Detail page for organisations should show only valid fields Content-Type: text/plain; charset="utf-8" The output of moremember.pl is supposed to change if the patron in question is an organization (has a category which is of type "I"). The script was checking borrowers.categorycode when it should have been checking categories.category_type. With this correction the right variable is passed to the template. The template needed additional corrections to be sure the correct fields were appearing. The patron entry form offers only phonepro and emailpro, so moremember.pl should output those fields in particular. This patch hides other fields as suggested by the Bug report. --- .../prog/en/modules/members/memberentrygen.tt | 14 +++++++++----- .../prog/en/modules/members/moremember.tt | 5 +++-- members/moremember.pl | 2 +- 3 files changed, 13 insertions(+), 8 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 236295d..fc54bac 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -201,7 +201,7 @@ [% ELSE %] + [% IF ( I ) %] Name: [% ELSE %] Surname: [% END %] [% IF ( uppercasesurnames ) %] [% ELSE %] @@ -474,6 +474,7 @@
Contact
    + [% UNLESS ( I ) %]
  1. [% IF ( mandatoryphone ) %] [% IF ( mandatoryphone ) %]Required[% END %]
    Shows on transit slips
    -
  2. + [% END %]
  3. [% IF ( mandatoryphonepro ) %] [% IF ( mandatoryphonepro ) %]Required[% END %]
  4. + [% UNLESS ( I ) %]
  5. [% IF ( mandatorymobile ) %]
  6. + [% END %] + [% UNLESS ( I ) %]
  7. [% IF ( mandatoryemail ) %] [% IF ( mandatoryemail ) %]Required[% END %]
    Shows on transit slips
    -
  8. + [% END %]
  9. [% IF ( mandatoryemailpro ) %] [% IF ( mandatoryemailpro ) %]Required[% END %]
  10. 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 67286bf..43bc75b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -177,7 +177,7 @@ function validate1(date) {
    - [% UNLESS ( I ) %][% IF ( othernames ) %]“[% othernames %]”[% END %] + [% UNLESS ( I ) %][% IF ( othernames ) %]“[% othernames %]”[% END %][% END %]

    [% streetnumber %] [% IF ( roaddetails ) %] @@ -188,7 +188,7 @@ function validate1(date) { [% IF ( city ) %][% city %][% END %] [% IF ( state ) %][% state %][% END %] [% IF ( zipcode ) %][% zipcode %]
    [% END %] - [% IF ( country ) %][% country %][% END %]

    + [% IF ( country ) %][% country %][% END %]

      @@ -210,6 +210,7 @@ function validate1(date) { [% IF ( email ) %]
    1. Email (home):[% email %]
    2. [% END %] [% IF ( emailpro ) %]
    3. Email (work): [% emailpro %]
    4. [% END %] [% END %] + [% UNLESS ( I ) %]
    5. Initials: [% initials %]
    6. Date of birth:[% dateofbirth %]
    7. Gender: diff --git a/members/moremember.pl b/members/moremember.pl index 9292fd0..f77137f 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -132,7 +132,7 @@ my $category_type = $data->{'category_type'}; ### $category_type # in template => instutitional (A for Adult& C for children) -$template->param( $data->{'categorycode'} => 1 ); +$template->param( $data->{'category_type'} => 1 ); $debug and printf STDERR "dates (enrolled,expiry,birthdate) raw: (%s, %s, %s)\n", map {$data->{$_}} qw(dateenrolled dateexpiry dateofbirth); foreach (qw(dateenrolled dateexpiry dateofbirth)) { -- 1.7.3