Bugzilla – Attachment 112064 Details for
Bug 11879
Add a new field to patron record: main contact method
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11879: (follow up) Some fixes and code cleanup
Bug-11879-follow-up-Some-fixes-and-code-cleanup.patch (text/plain), 22.29 KB, created by
Maryse Simard
on 2020-10-20 17:42:32 UTC
(
hide
)
Description:
Bug 11879: (follow up) Some fixes and code cleanup
Filename:
MIME Type:
Creator:
Maryse Simard
Created:
2020-10-20 17:42:32 UTC
Size:
22.29 KB
patch
obsolete
>From 10b5a93b389ca7aac889a248af85da5511419c57 Mon Sep 17 00:00:00 2001 >From: Maryse Simard <maryse.simard@inlibro.com> >Date: Tue, 20 Oct 2020 11:56:42 -0400 >Subject: [PATCH] Bug 11879: (follow up) Some fixes and code cleanup > >- Display the value in the patron detail page >- Adds support for BorrowerUnwantedField (staff) >- Removes unecessary code in opac/opac-memberentry.pl > >Sponsored-by: CCSR ( http://www.ccsr.qc.ca ) >--- > .../borrowers_primary_contact_method.perl | 6 +- > .../modules/admin/preferences/borrowers.json | 3 +- > .../prog/en/modules/members/memberentrygen.tt | 100 +++++++++--------- > .../prog/en/modules/members/moremember.tt | 4 +- > .../bootstrap/en/modules/opac-memberentry.tt | 72 +++++-------- > opac/opac-memberentry.pl | 14 --- > 6 files changed, 87 insertions(+), 112 deletions(-) > >diff --git a/installer/data/mysql/atomicupdate/borrowers_primary_contact_method.perl b/installer/data/mysql/atomicupdate/borrowers_primary_contact_method.perl >index e34fc015a2..a422b78fdd 100644 >--- a/installer/data/mysql/atomicupdate/borrowers_primary_contact_method.perl >+++ b/installer/data/mysql/atomicupdate/borrowers_primary_contact_method.perl >@@ -1,15 +1,15 @@ > $DBversion = 'XXX'; # will be replaced by the RM > if( CheckVersion( $DBversion ) ) { > if( !column_exists( 'borrowers', 'primary_contact_method' ) ) { >- $dbh->do( "ALTER TABLE `borrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL AFTER `anonymized`" ); >+ $dbh->do( "ALTER TABLE `borrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) DEFAULT NULL AFTER `autorenew_checkouts`" ); > } > > if( !column_exists( 'deletedborrowers', 'primary_contact_method' ) ) { >- $dbh->do( "ALTER TABLE `deletedborrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL AFTER `anonymized`" ); >+ $dbh->do( "ALTER TABLE `deletedborrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) DEFAULT NULL AFTER `autorenew_checkouts`" ); > } > > if( !column_exists( 'borrower_modifications', 'primary_contact_method' ) ) { >- $dbh->do( "ALTER TABLE `borrower_modifications` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL AFTER `gdpr_proc_consent`" ); >+ $dbh->do( "ALTER TABLE `borrower_modifications` ADD COLUMN `primary_contact_method` VARCHAR(45) DEFAULT NULL AFTER `gdpr_proc_consent`" ); > } > > SetVersion( $DBversion ); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/borrowers.json b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/borrowers.json >index 62b75d2705..1a3f77e051 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/borrowers.json >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/borrowers.json >@@ -51,5 +51,6 @@ > "altcontactzipcode": "altcontactzipcode", > "altcontactcountry": "altcontactcountry", > "altcontactphone": "altcontactphone", >- "smsalertnumber": "smsalertnumber" >+ "smsalertnumber": "smsalertnumber", >+ "primary_contact_method": "primary_contact_method" > } >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 f19d269750..a289c0ee7b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >@@ -741,63 +741,65 @@ legend:hover { > </li> > [% END #/UNLESS nofax %] > >- <li> >- [% IF mandatoryprimary_contact_method %] >- <label for="primary_contact_method" class="required"> >- [% ELSE %] >- <label for="primary_contact_method"> >- [% END %] >- Main contact method: </label> >+ [% UNLESS noprimary_contact_method %] >+ <li> >+ [% IF mandatoryprimary_contact_method %] >+ <label for="primary_contact_method" class="required"> >+ [% ELSE %] >+ <label for="primary_contact_method"> >+ [% END %] >+ Main contact method: </label> > >- <select id="primary_contact_method" name="primary_contact_method"> >- <option value=""></option> >- [% UNLESS nophone %] >- [% IF ( primary_contact_method == 'phone' ) %] >- <option value="phone" selected="selected">Primary phone</option> >- [% ELSE %] >- <option value="phone">Primary phone</option> >+ <select id="primary_contact_method" name="primary_contact_method"> >+ <option value=""></option> >+ [% UNLESS nophone %] >+ [% IF ( primary_contact_method == 'phone' ) %] >+ <option value="phone" selected="selected">Primary phone</option> >+ [% ELSE %] >+ <option value="phone">Primary phone</option> >+ [% END %] > [% END %] >- [% END %] >- [% UNLESS nophonepro %] >- [% IF ( primary_contact_method == 'phonepro' ) %] >- <option value="phonepro" selected="selected">Secondary phone</option> >- [% ELSE %] >- <option value="phonepro">Secondary phone</option> >+ [% UNLESS nophonepro %] >+ [% IF ( primary_contact_method == 'phonepro' ) %] >+ <option value="phonepro" selected="selected">Secondary phone</option> >+ [% ELSE %] >+ <option value="phonepro">Secondary phone</option> >+ [% END %] > [% END %] >- [% END %] >- [% UNLESS nomobile %] >- [% IF ( primary_contact_method == 'mobile' ) %] >- <option value="mobile" selected="selected">Other phone</option> >- [% ELSE %] >- <option value="mobile">Other phone</option> >+ [% UNLESS nomobile %] >+ [% IF ( primary_contact_method == 'mobile' ) %] >+ <option value="mobile" selected="selected">Other phone</option> >+ [% ELSE %] >+ <option value="mobile">Other phone</option> >+ [% END %] > [% END %] >- [% END %] >- [% UNLESS noemail %] >- [% IF ( primary_contact_method == 'email' ) %] >- <option value="email" selected="selected">Primary email</option> >- [% ELSE %] >- <option value="email">Primary email</option> >+ [% UNLESS noemail %] >+ [% IF ( primary_contact_method == 'email' ) %] >+ <option value="email" selected="selected">Primary email</option> >+ [% ELSE %] >+ <option value="email">Primary email</option> >+ [% END %] > [% END %] >- [% END %] >- [% UNLESS noemailpro %] >- [% IF ( primary_contact_method == 'emailpro' ) %] >- <option value="emailpro" selected="selected">Secondary email</option> >- [% ELSE %] >- <option value="emailpro">Secondary email</option> >+ [% UNLESS noemailpro %] >+ [% IF ( primary_contact_method == 'emailpro' ) %] >+ <option value="emailpro" selected="selected">Secondary email</option> >+ [% ELSE %] >+ <option value="emailpro">Secondary email</option> >+ [% END %] > [% END %] >- [% END %] >- [% UNLESS nofax %] >- [% IF ( primary_contact_method == 'fax' ) %] >- <option value="fax" selected="selected">Fax</option> >- [% ELSE %] >- <option value="fax">Fax</option> >+ [% UNLESS nofax %] >+ [% IF ( primary_contact_method == 'fax' ) %] >+ <option value="fax" selected="selected">Fax</option> >+ [% ELSE %] >+ <option value="fax">Fax</option> >+ [% END %] > [% END %] >+ </select> >+ [% IF mandatoryprimary_contact_method %] >+ <span class="required">Required</span> > [% END %] >- </select> >- [% IF mandatoryprimary_contact_method %] >- <span class="required">Required</span> >- [% END %] >- </li> >+ </li> >+ [% END %] > </ol> > </fieldset> <!-- /#memberentry_contact --> > [% END # hide fieldset %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >index ee44e3cc9d..5c56406ba8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -311,10 +311,10 @@ > </li> > [% END %] > >- [% IF ( primary_contact_method ) %] >+ [% IF ( patron.primary_contact_method ) %] > <li> > <span class="label">Main contact method: </span> >- [% SWITCH primary_contact_method %] >+ [% SWITCH patron.primary_contact_method %] > [% CASE 'phone' %] > Primary phone > [% CASE 'phonepro' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt >index 70381a3bf9..77fc62151a 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt >@@ -634,49 +634,35 @@ > > <select id="borrower_primary_contact_method" name="borrower_primary_contact_method"> > <option value=""></option> >- [% FOREACH contactprincipalloo IN contactprincipalloop %] >- [% IF ( contactprincipalloo.currentis_phone ) %] >- [% IF ( borrower.primary_contact_method == 'phone' ) %] >- <option value="phone" selected="selected">Primary phone</option> >- [% ELSE %] >- <option value="phone">Primary phone</option> >- [% END %] >- [% END %] >- [% IF ( contactprincipalloo.currentis_phonepro ) %] >- [% IF ( borrower.primary_contact_method == 'phonepro' ) %] >- <option value="phonepro" selected="selected">Secondary phone</option> >- [% ELSE %] >- <option value="phonepro">Secondary phone</option> >- [% END %] >- [% END %] >- [% IF ( contactprincipalloo.currentis_mobile ) %] >- [% IF ( borrower.primary_contact_method == 'mobile' ) %] >- <option value="mobile" selected="selected">Other phone</option> >- [% ELSE %] >- <option value="mobile">Other phone</option> >- [% END %] >- [% END %] >- [% IF ( contactprincipalloo.currentis_email ) %] >- [% IF ( borrower.primary_contact_method == 'email' ) %] >- <option value="email" selected="selected">Primary email</option> >- [% ELSE %] >- <option value="email">Primary email</option> >- [% END %] >- [% END %] >- [% IF ( contactprincipalloo.currentis_emailpro ) %] >- [% IF ( borrower.primary_contact_method == 'emailpro' ) %] >- <option value="emailpro" selected="selected">Secondary email</option> >- [% ELSE %] >- <option value="emailpro">Secondary email</option> >- [% END %] >- [% END %] >- [% IF ( contactprincipalloo.currentis_fax ) %] >- [% IF ( borrower.primary_contact_method == 'fax' ) %] >- <option value="fax" selected="selected">Fax</option> >- [% ELSE %] >- <option value="fax">Fax</option> >- [% END %] >- [% END %] >+ [% IF ( borrower.primary_contact_method == 'phone' ) %] >+ <option value="phone" selected="selected">Primary phone</option> >+ [% ELSE %] >+ <option value="phone">Primary phone</option> >+ [% END %] >+ [% IF ( borrower.primary_contact_method == 'phonepro' ) %] >+ <option value="phonepro" selected="selected">Secondary phone</option> >+ [% ELSE %] >+ <option value="phonepro">Secondary phone</option> >+ [% END %] >+ [% IF ( borrower.primary_contact_method == 'mobile' ) %] >+ <option value="mobile" selected="selected">Other phone</option> >+ [% ELSE %] >+ <option value="mobile">Other phone</option> >+ [% END %] >+ [% IF ( borrower.primary_contact_method == 'email' ) %] >+ <option value="email" selected="selected">Primary email</option> >+ [% ELSE %] >+ <option value="email">Primary email</option> >+ [% END %] >+ [% IF ( borrower.primary_contact_method == 'emailpro' ) %] >+ <option value="emailpro" selected="selected">Secondary email</option> >+ [% ELSE %] >+ <option value="emailpro">Secondary email</option> >+ [% END %] >+ [% IF ( borrower.primary_contact_method == 'fax' ) %] >+ <option value="fax" selected="selected">Fax</option> >+ [% ELSE %] >+ <option value="fax">Fax</option> > [% END %] > </select> > [% IF ( mandatory.defined('primary_contact_method') ) %]<span class="required">Required</span>[% END %] >diff --git a/opac/opac-memberentry.pl b/opac/opac-memberentry.pl >index ab26559eb6..6b7afc0175 100755 >--- a/opac/opac-memberentry.pl >+++ b/opac/opac-memberentry.pl >@@ -101,20 +101,6 @@ $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 >- }; >- } >-} >- >-$template->param('contactprincipalloop' => \@contactprincipalloop); >- > my $attributes = ParsePatronAttributes($borrowernumber,$cgi); > my $conflicting_attribute = 0; > >-- >2.17.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 11879
:
25745
|
25922
|
25941
|
31300
|
31301
|
31320
|
34351
|
34482
|
34502
|
34503
|
34571
|
34572
|
34573
|
41209
|
41220
|
41221
|
41222
|
46101
|
46284
|
46285
|
46286
|
48073
|
48074
|
48075
|
48076
|
48077
|
48078
|
48079
|
48556
|
48557
|
48558
|
48559
|
50433
|
52607
|
52608
|
52614
|
52615
|
52616
|
52617
|
52618
|
52619
|
52620
|
53229
|
53688
|
53695
|
53705
|
53707
|
53708
|
53709
|
53710
|
53711
|
53712
|
53713
|
55946
|
56285
|
56286
|
58580
|
58591
|
58592
|
58593
|
63238
|
63239
|
65811
|
65812
|
69028
|
69029
|
69050
|
71955
|
71956
|
71957
|
71958
|
72632
|
72633
|
72634
|
72635
|
73987
|
73988
|
73989
|
73990
|
74123
|
74124
|
74125
|
74126
|
74818
|
75652
|
83757
|
83758
|
84017
|
84018
|
84019
|
84020
|
84021
|
84022
|
88358
|
88359
|
88360
|
88361
|
88362
|
88363
|
88394
|
88395
|
88396
|
88397
|
88398
|
88399
|
88400
|
93850
|
93851
|
93852
|
93853
|
93854
|
93855
|
93856
|
93900
|
93901
|
94456
|
94457
|
94458
|
94459
|
94460
|
94461
|
94463
|
94464
|
94465
|
94466
|
94467
|
94468
|
96432
|
100817
|
100843
|
112062
|
112063
|
112064
|
112557
|
112559
|
112560
|
118959
|
118960
|
118961
|
118962
|
118985
|
118986
|
118987
|
118988
|
120947
|
120948
|
120949
|
120950
|
122778