Bugzilla – Attachment 25941 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 [QA Followup] - Fix patch to follow modern coding guidelines
Bug-11879-QA-Followup---Fix-patch-to-follow-modern.patch (text/plain), 5.69 KB, created by
Kyle M Hall (khall)
on 2014-03-07 17:03:30 UTC
(
hide
)
Description:
Bug 11879 [QA Followup] - Fix patch to follow modern coding guidelines
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2014-03-07 17:03:30 UTC
Size:
5.69 KB
patch
obsolete
>From 07c6ef6cb6d4a4d1c70fa0fe6a4c239f3cf825df Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Fri, 7 Mar 2014 12:02:34 -0500 >Subject: [PATCH] Bug 11879 [QA Followup] - Fix patch to follow modern coding guidelines > >--- > installer/data/mysql/updatedatabase.pl | 4 +- > .../prog/en/modules/members/memberentrygen.tt | 49 +++++++++++++------- > members/memberentry.pl | 11 ---- > 3 files changed, 34 insertions(+), 30 deletions(-) > >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index 4384db1..024665b 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -8014,8 +8014,8 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { > > $DBversion = "XXX"; > if ( CheckVersion($DBversion) ) { >- $dbh->do("ALTER TABLE `borrowers` ADD COLUMN `contactprincipal` VARCHAR(45) NULL DEFAULT NULL;"); >- print "Upgrade to $DBversion done (Add the contactprincipal column to the borrowers table)\n"; >+ $dbh->do("ALTER TABLE `borrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) NULL DEFAULT NULL;"); >+ print "Upgrade to $DBversion done (Add the primary_contact_method column to the borrowers table)\n"; > SetVersion($DBversion); > } > >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 edf103d..cb25c27 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >@@ -643,35 +643,50 @@ > [% IF ( mandatoryfax ) %]<span class="required">Required</span>[% END %] > </li> > <li> >- <label for="contactprincipal">Main Contact Method</label> >- <select id="contactprincipal" name="contactprincipal"> >+ <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 ) %] >- <option value="phone" [% IF ( contactprincipalloo.selected ) %]selected="selected"[% END %]>Phone (home)</option> >+ [% 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 ) %] >- <option value="phonepro" [% IF ( contactprincipalloo.selected ) %]selected="selected"[% END %]>Phone (work)</option> >+ >+ [% 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 ) %] >- <option value="mobile" [% IF ( contactprincipalloo.selected ) %]selected="selected"[% END %]>Phone (cell)</option> >+ >+ [% 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 ) %] >- <option value="email" [% IF ( contactprincipalloo.selected ) %]selected="selected"[% END %]>Email (home)</option> >+ >+ [% 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 ) %] >- <option value="emailpro" [% IF ( contactprincipalloo.selected ) %]selected="selected"[% END %]>Email (work)</option> >+ >+ [% 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 ) %] >- <option value="fax" [% IF ( contactprincipalloo.selected ) %]selected="selected"[% END %]>Fax</option> >+ >+ [% IF ( primary_contact_method == 'fax' ) %] >+ <option value="fax" selected="selected">Fax</option> >+ [% ELSE %] >+ <option value="fax">Fax</option> > [% END %] >- [% END %] > </select> > </li> > [% END %] > </ol> > </fieldset> >-[%END # hide fieldset %] >+[% END # hide fieldset %] > > <!-- ************************ STEP_1 *********************** --> > [% END %] >diff --git a/members/memberentry.pl b/members/memberentry.pl >index 35e2936..50738f2 100755 >--- a/members/memberentry.pl >+++ b/members/memberentry.pl >@@ -526,17 +526,6 @@ $template->param('typeloop' => \@typeloop, > no_categories => $no_categories); > if($no_categories){ $no_add = 1; } > >-my @contactprincipalloop; >-foreach (qw(phone phonepro mobile email emailpro fax)) { >- push @contactprincipalloop,{ >- 'code' => $_, >- 'selected' => (defined($borrower_data->{'contactprincipal'}) && >- $_ eq $borrower_data->{'contactprincipal'}), >- 'currentis_' . $_ => 1 >- }; >-} >-$template->param('contactprincipalloop' => \@contactprincipalloop); >- > # test in city > if ( $guarantorid ) { > $select_city = getidcity($data{city}); >-- >1.7.2.5
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