From 89a0c45aedea65ab7c99c7920dff85abae97ace1 Mon Sep 17 00:00:00 2001 From: Charles Farmer Date: Mon, 19 Feb 2018 10:21:23 -0500 Subject: [PATCH] Bug 11879: (QA follow-up) Fix problems found in code review Signed-off-by: Lucie Gay Signed-off-by: Katrin Fischer Signed-off-by: Hayley Mapley Signed-off-by: Bin Wen --- .../borrowers_primary_contact_method.sql | 2 +- .../prog/en/modules/members/memberentrygen.tt | 11 ++++++++++ .../en/modules/members/moremember-brief.tt | 2 +- members/moremember.pl | 3 --- opac/opac-memberentry.pl | 22 +++++++++---------- 5 files changed, 24 insertions(+), 16 deletions(-) diff --git a/installer/data/mysql/atomicupdate/borrowers_primary_contact_method.sql b/installer/data/mysql/atomicupdate/borrowers_primary_contact_method.sql index 000791d8cb..65b6b58c91 100644 --- a/installer/data/mysql/atomicupdate/borrowers_primary_contact_method.sql +++ b/installer/data/mysql/atomicupdate/borrowers_primary_contact_method.sql @@ -1,3 +1,3 @@ -ALTER TABLE `borrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL AFTER `lastseen`; +ALTER TABLE `borrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL AFTER `overdrive_auth_token`; ALTER TABLE `deletedborrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL AFTER `overdrive_auth_token`; ALTER TABLE `borrower_modifications` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL AFTER `extended_attributes`; 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 499f81d54a..64e570f72b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -577,6 +577,17 @@ [% IF ( mandatoryemailpro ) %]Required[% END %] [% END %] + [% UNLESS nofax %] +
  • + [% IF ( mandatoryfax ) %] +
  • [% UNLESS nofax %]
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt index 1c3b2c3b1b..ecf83fe027 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt @@ -18,7 +18,7 @@
    - [% IF ( patron.othernames ) %]“[% patron.othernames | html %]”[% END %] + [% UNLESS ( I ) %][% IF ( patron.othernames ) %]“[% patron.othernames %]”[% END %]
      [% IF Koha.Preference( 'AddressFormat' ) %] diff --git a/members/moremember.pl b/members/moremember.pl index afaf6175a1..b40c80c30c 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -204,9 +204,6 @@ $template->param( fines => $patron->account->balance, translated_language => $translated_language, detailview => 1, - borrowernumber => $borrowernumber, - othernames => $data->{'othernames'}, - categoryname => $patron->category->description, primary_contact_method => $data->{'primary_contact_method'}, was_renewed => scalar $input->param('was_renewed') ? 1 : 0, $category_type => 1, # [% IF ( I ) %] = institutional/organisation diff --git a/opac/opac-memberentry.pl b/opac/opac-memberentry.pl index 0e8efab9d5..0642a1bb75 100755 --- a/opac/opac-memberentry.pl +++ b/opac/opac-memberentry.pl @@ -95,18 +95,18 @@ $template->param( OPACPatronDetails => C4::Context->preference('OPACPatronDetails'), ); my $check_BorrowerMandatoryField=C4::Context->preference("BorrowerMandatoryField"); - my @field_check=split(/\|/,$check_BorrowerMandatoryField); - 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 - }; - } - } +my @field_check=split(/\|/,$check_BorrowerMandatoryField); +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); +$template->param('contactprincipalloop' => \@contactprincipalloop); my $attributes = ParsePatronAttributes($borrowernumber,$cgi); my $conflicting_attribute = 0; -- 2.17.1