Bugzilla – Attachment 53713 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 Follow-up
Bug-11879---QA-Follow-up.patch (text/plain), 4.93 KB, created by
Mehdi Hamidi
on 2016-07-25 17:59:38 UTC
(
hide
)
Description:
Bug 11879 - QA Follow-up
Filename:
MIME Type:
Creator:
Mehdi Hamidi
Created:
2016-07-25 17:59:38 UTC
Size:
4.93 KB
patch
obsolete
>From 476b7c6318cdd5ca3b007ab729744dab0f6b6315 Mon Sep 17 00:00:00 2001 >From: mehdi <mehdi@inlibro.com> >Date: Fri, 8 Jul 2016 13:42:02 -0400 >Subject: [PATCH] Bug 11879 - QA Follow-up > >updatedatabase.pl no longer adds column primary_contact_method to table borrowers >Fixed the incorrectly capitalized label and added the ':' in front of it(opac and intranet). >Changed mobile phone to other phone in intranet and added a switch case in moremember.tt >to display the correct label. >--- > installer/data/mysql/updatedatabase.pl | 6 ------ > .../prog/en/modules/members/memberentrygen.tt | 6 +++--- > .../intranet-tmpl/prog/en/modules/members/moremember.tt | 15 ++++++++++++++- > .../opac-tmpl/bootstrap/en/modules/opac-memberentry.tt | 2 +- > 4 files changed, 18 insertions(+), 11 deletions(-) > >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index ab4916a..994a5d7 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -8724,12 +8724,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) ) { >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 7ee21e6..0c14b3a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >@@ -568,7 +568,7 @@ $(document).ready(function() { > > [% END %] > <li> >- <label for="primary_contact_method">Main Contact Method</label> >+ <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 %] >@@ -588,9 +588,9 @@ $(document).ready(function() { > [% END %] > [% IF ( contactprincipalloo.currentis_mobile ) %] > [% IF ( primary_contact_method == 'mobile' ) %] >- <option value="mobile" selected="selected">Mobile phone</option> >+ <option value="mobile" selected="selected">Other phone</option> > [% ELSE %] >- <option value="mobile">Mobile phone</option> >+ <option value="mobile">Other phone</option> > [% END %] > [% END %] > [% IF ( contactprincipalloo.currentis_email ) %] >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 965cf3b..efbf47e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -265,7 +265,20 @@ function validate1(date) { > [% END %] > </li> > [% END %] >- <li><span class="label">Main contact method: </span>[% primary_contact_method %]</li> >+ [% SWITCH primary_contact_method %] >+ [% CASE 'phone' %] >+ <li><span class="label">Main contact method: </span>Phone</li> >+ [% CASE 'phonepro' %] >+ <li><span class="label">Main contact method: </span>Secondary phone</li> >+ [% CASE 'mobile' %] >+ <li><span class="label">Main contact method: </span>Other Phone</li> >+ [% CASE 'email' %] >+ <li><span class="label">Main contact method: </span>Primary email</li> >+ [% CASE 'emailpro' %] >+ <li><span class="label">Main contact method: </span>Secondary email</li> >+ [% CASE 'fax' %] >+ <li><span class="label">Main contact method: </span>Fax</li> >+ [% END %] > </ol> > </div> > <div class="action"> >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 e692b0a..08cdf3f 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt >@@ -544,7 +544,7 @@ > </li> > [% END %] > <li> >- <label for="borrower_primary_contact_method">Main Contact Method</label> >+ <label for="borrower_primary_contact_method">Main contact method:</label> > <select id="borrower_primary_contact_method" name="borrower_primary_contact_method"> > <option value=""></option> > [% FOREACH contactprincipalloo IN contactprincipalloop %] >-- >1.9.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