From 80924ed30b851da28fef85d7957bc0a03d8ac3b3 Mon Sep 17 00:00:00 2001 From: simith Date: Wed, 17 Dec 2014 09:16:32 -0500 Subject: [PATCH] [PASSED QA] 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 --- installer/data/mysql/updatedatabase.pl | 13 ++-- .../prog/en/modules/members/memberentrygen.tt | 68 ++++++++++++-------- members/memberentry.pl | 12 ++++ 3 files changed, 60 insertions(+), 33 deletions(-) diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 15b58ce..654c02a 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -8672,12 +8672,6 @@ if ( CheckVersion($DBversion) ) { print "Upgrade to $DBversion done (Bug 10402: Move bookseller contacts to separate table)\n"; SetVersion($DBversion); } -$DBversion = "XXX"; -if ( CheckVersion($DBversion) ) { - $dbh->do("ALTER TABLE `borrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL;"); - print "Upgrade to $DBversion done (Bug 11879: Add a new borrower field : main contact method)\n"; - SetVersion($DBversion); -} $DBversion = "3.17.00.017"; if ( CheckVersion($DBversion) ) { @@ -9591,6 +9585,13 @@ if ( CheckVersion($DBversion) ) { SetVersion ($DBversion); } +$DBversion = "XXX"; +if ( CheckVersion($DBversion) ) { + $dbh->do("ALTER TABLE `borrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL;"); + print "Upgrade to $DBversion done (Bug 11879: Add a new borrower field : main contact method)\n"; + SetVersion($DBversion); +} + =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 b2eff65..e0cfc73 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -637,7 +637,7 @@ [% 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 7a0329f..cd7bd7a 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -547,6 +547,18 @@ foreach (qw(C A S P I X)) { $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); + # test in city if ( $guarantorid ) { $select_city = getidcity($data{city}); -- 1.7.2.5