From 46314c3c69d5ee3064f814f583c656991be75724 Mon Sep 17 00:00:00 2001 From: simith Date: Wed, 17 Dec 2014 09:16:32 -0500 Subject: [PATCH] [SIGNED-OFF] 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 | 7 +- .../prog/en/modules/members/memberentrygen.tt | 68 ++++++++++++-------- members/memberentry.pl | 12 ++++ 4 files changed, 55 insertions(+), 33 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 22eb351..0bd822e 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -8719,12 +8719,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) ) { @@ -11756,6 +11750,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 3b42c52..fc39387 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -582,7 +582,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 843cbeb..611b14c 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -531,6 +531,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.10.4