Bugzilla – Attachment 94460 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: Remove unecessary code in controller
Bug-11879-Remove-unecessary-code-in-controller.patch (text/plain), 7.35 KB, created by
Bin Wen
on 2019-10-21 15:53:10 UTC
(
hide
)
Description:
Bug 11879: Remove unecessary code in controller
Filename:
MIME Type:
Creator:
Bin Wen
Created:
2019-10-21 15:53:10 UTC
Size:
7.35 KB
patch
obsolete
>From 19b0747e9d9f1771046cecc18331b2190c899e52 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Tue, 24 Apr 2018 13:45:03 -0300 >Subject: [PATCH] Bug 11879: Remove unecessary code in controller > >- adds the field required is defined in BorrowerMandatoryField (staff >only) >- removes code from controller (not needed, we can follow existing >pattern) >- does not send patron's attribute separately (we have the 'patron' >variable already) > >Need to be done: >- same changes for the OPAC >- remove extra changes made to moremember-brief.tt (if bugfix it needs >to be moved on a separate bug report) >- deal with PatronSelfModificationBorrowerUnwantedField and >PatronSelfRegistrationBorrowerUnwantedField > >I first thought it would have replaced AutoEmailPrimaryAddress, but it >actually only needed for display purpose, how/where can we explain that? >Are release notes enough? > >Signed-off-by: Hayley Mapley <hayleymapley@catalyst.net.nz> >Signed-off-by: Bin Wen <bin.wen@inlibro.com> >--- > .../prog/en/modules/members/memberentrygen.tt | 91 ++++++++++--------- > members/memberentry.pl | 11 --- > members/moremember.pl | 1 - > 3 files changed, 49 insertions(+), 54 deletions(-) > >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 64e570f72b..9fe5d03951 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >@@ -602,54 +602,61 @@ > </li> > [% END %] > <li> >- <label for="primary_contact_method">Main contact method:</label> >- <select id="primary_contact_method" name="primary_contact_method"> >- <option value=""></option> >- [% FOREACH contactprincipalloo IN contactprincipalloop %] >- [% IF ( contactprincipalloo.currentis_phone ) %] >- [% IF ( primary_contact_method == 'phone' ) %] >- <option value="phone" selected="selected">Primary phone</option> >- [% ELSE %] >- <option value="phone">Primary phone</option> >- [% END %] >+ [% 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> > [% END %] >- [% IF ( contactprincipalloo.currentis_phonepro ) %] >- [% IF ( primary_contact_method == 'phonepro' ) %] >- <option value="phonepro" selected="selected">Secondary phone</option> >- [% ELSE %] >- <option value="phonepro">Secondary phone</option> >- [% END %] >+ [% END %] >+ [% UNLESS nophonepro %] >+ [% IF ( primary_contact_method == 'phonepro' ) %] >+ <option value="phonepro" selected="selected">Secondary phone</option> >+ [% ELSE %] >+ <option value="phonepro">Secondary phone</option> > [% END %] >- [% IF ( contactprincipalloo.currentis_mobile ) %] >- [% IF ( primary_contact_method == 'mobile' ) %] >- <option value="mobile" selected="selected">Other phone</option> >- [% ELSE %] >- <option value="mobile">Other phone</option> >- [% END %] >+ [% END %] >+ [% UNLESS nomobile %] >+ [% IF ( primary_contact_method == 'mobile' ) %] >+ <option value="mobile" selected="selected">Other phone</option> >+ [% ELSE %] >+ <option value="mobile">Other phone</option> > [% END %] >- [% IF ( contactprincipalloo.currentis_email ) %] >- [% IF ( primary_contact_method == 'email' ) %] >- <option value="email" selected="selected">Primary email</option> >- [% ELSE %] >- <option value="email">Primary email</option> >- [% END %] >+ [% END %] >+ [% UNLESS noemail %] >+ [% IF ( primary_contact_method == 'email' ) %] >+ <option value="email" selected="selected">Primary email</option> >+ [% ELSE %] >+ <option value="email">Primary email</option> > [% END %] >- [% IF ( contactprincipalloo.currentis_emailpro ) %] >- [% IF ( primary_contact_method == 'emailpro' ) %] >- <option value="emailpro" selected="selected">Secondary email</option> >- [% ELSE %] >- <option value="emailpro">Secondary email</option> >- [% END %] >+ [% END %] >+ [% UNLESS noemailpro %] >+ [% IF ( primary_contact_method == 'emailpro' ) %] >+ <option value="emailpro" selected="selected">Secondary email</option> >+ [% ELSE %] >+ <option value="emailpro">Secondary email</option> > [% END %] >- [% IF ( contactprincipalloo.currentis_fax ) %] >- [% IF ( primary_contact_method == 'fax' ) %] >- <option value="fax" selected="selected">Fax</option> >- [% ELSE %] >- <option value="fax">Fax</option> >- [% END %] >+ [% END %] >+ [% UNLESS nofax %] >+ [% IF ( primary_contact_method == 'fax' ) %] >+ <option value="fax" selected="selected">Fax</option> >+ [% ELSE %] >+ <option value="fax">Fax</option> > [% END %] >- [% END %] >- </select> >+ [% END %] >+ </select> >+ [% IF mandatoryprimary_contact_method %] >+ <span class="required">Required</span> >+ [% END %] > </li> > </ol> > >diff --git a/members/memberentry.pl b/members/memberentry.pl >index ca80356342..c7323662ff 100755 >--- a/members/memberentry.pl >+++ b/members/memberentry.pl >@@ -640,17 +640,6 @@ $template->param( > ); > 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' ); > $template->param( >diff --git a/members/moremember.pl b/members/moremember.pl >index b40c80c30c..593b0d1156 100755 >--- a/members/moremember.pl >+++ b/members/moremember.pl >@@ -204,7 +204,6 @@ $template->param( > fines => $patron->account->balance, > translated_language => $translated_language, > detailview => 1, >- primary_contact_method => $data->{'primary_contact_method'}, > was_renewed => scalar $input->param('was_renewed') ? 1 : 0, > $category_type => 1, # [% IF ( I ) %] = institutional/organisation > housebound_role => scalar $patron->housebound_role, >-- >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