From dba95d582768d4728d812bdd5c4abfff2a2fa8cc Mon Sep 17 00:00:00 2001 From: simith Date: Wed, 17 Dec 2014 09:16:32 -0500 Subject: [PATCH] Bug 11879 - Fix syspref BorrowerUnwantedField How I tested: Apply 1st patch Apply this patch Edit syspref BorrowerUnwantedField to exclude fields Edit patron's contact information Make sure that fields do not longer appear in drop down for Main contact Wors as expected http://bugs.koha-community.org/show_bug.cgi?id=11879 Signed-off-by: Marc Veron Signed-off-by: Kyle M Hall Signed-off-by: Aleisha --- installer/data/mysql/updatedatabase.pl | 1 + .../prog/en/modules/members/memberentrygen.tt | 70 +++++++++++++--------- members/memberentry.pl | 10 ++++ 3 files changed, 52 insertions(+), 29 deletions(-) diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index d3f8377..ab4916a 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -12809,6 +12809,7 @@ foreach my $file ( sort readdir $dirh ) { } } + =head1 FUNCTIONS =head2 TableExists($table) 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 0f24f38..7ee21e6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -554,7 +554,7 @@ $(document).ready(function() { [% IF ( mandatoryemailpro ) %]Required[% END %] [% END %] - [% UNLESS nofax %] + [% UNLESS nofax %]
  • [% IF ( mandatoryfax ) %]
  • [% END %] -
  • - - + [%END # hide fieldset %] diff --git a/members/memberentry.pl b/members/memberentry.pl index 067f4f5..4d8e083 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -536,6 +536,16 @@ $template->param('typeloop' => \@typeloop, no_categories => $no_categories); if($no_categories){ $no_add = 1; } +my @contactprincipalloop; +my @fieldArray = qw(phone phonepro mobile email emailpro fax); +foreach my $field (@fieldArray) { + if ( !(grep { $field eq $_ } @field_check)){ + push @contactprincipalloop,{ + 'currentis_' . $field => 1 + }; + } +} +$template->param('contactprincipalloop' => \@contactprincipalloop); my $cities = Koha::Cities->search( {}, { order_by => 'city_name' } ); my $roadtypes = C4::Koha::GetAuthorisedValues( 'ROADTYPE' ); -- 1.9.1