From 84b7e5ac8e56d365809bb425af027d759a9c5d5d 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 --- .../borrowers_primary_contact_method.sql | 1 + installer/data/mysql/updatedatabase.pl | 1 + .../prog/en/modules/members/memberentrygen.tt | 55 +++++++++++++++++++++- members/memberentry.pl | 10 ++++ 4 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/borrowers_primary_contact_method.sql diff --git a/installer/data/mysql/atomicupdate/borrowers_primary_contact_method.sql b/installer/data/mysql/atomicupdate/borrowers_primary_contact_method.sql new file mode 100644 index 0000000..69665f3 --- /dev/null +++ b/installer/data/mysql/atomicupdate/borrowers_primary_contact_method.sql @@ -0,0 +1 @@ +ALTER TABLE `borrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL; \ No newline at end of file diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index eb9d1f7..fe24630 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -12655,6 +12655,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 12c1e83..fc861b6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -462,7 +462,7 @@ $(document).ready(function() { [% IF ( mandatoryemailpro ) %]Required[% END %] [% END %] - [% UNLESS nofax %] + [% UNLESS nofax %]
  • [% IF ( mandatoryfax ) %]
  • [% END %] - + [% END %] +
  • + + +
  • + [%END # hide fieldset %] diff --git a/members/memberentry.pl b/members/memberentry.pl index 597c68d..1b98519 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -537,6 +537,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