Bugzilla – Attachment 84019 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) Fix problems found in code review
Bug-11879-QA-follow-up-Fix-problems-found-in-code-.patch (text/plain), 7.82 KB, created by
José-Mario Monteiro-Santos
on 2019-01-15 21:19:59 UTC
(
hide
)
Description:
Bug 11879: (QA follow-up) Fix problems found in code review
Filename:
MIME Type:
Creator:
José-Mario Monteiro-Santos
Created:
2019-01-15 21:19:59 UTC
Size:
7.82 KB
patch
obsolete
>From a2823d96a65d8fc31081a314b356090842167abb Mon Sep 17 00:00:00 2001 >From: Charles Farmer <charles.farmer@inLibro.com> >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 <lucie.gay@ens-paris-saclay.fr> > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > .../borrowers_primary_contact_method.sql | 2 +- > installer/data/mysql/updatedatabase.pl | 1 - > .../prog/en/modules/members/memberentrygen.tt | 5 ++--- > .../prog/en/modules/members/moremember-brief.tt | 8 ++++---- > .../prog/en/modules/members/moremember.tt | 9 --------- > members/moremember.pl | 3 --- > opac/opac-memberentry.pl | 22 +++++++++++----------- > 7 files changed, 18 insertions(+), 32 deletions(-) > >diff --git a/installer/data/mysql/atomicupdate/borrowers_primary_contact_method.sql b/installer/data/mysql/atomicupdate/borrowers_primary_contact_method.sql >index 000791d..65b6b58 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/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index c6acc38..b4d246a 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -17263,7 +17263,6 @@ foreach my $file ( sort readdir $dirh ) { > } > } > >- > =head1 FUNCTIONS > > =head2 TableExists($table) >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 e7a4284..c741ef9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >@@ -430,8 +430,7 @@ > > [% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %] > <fieldset class="rows" id="memberentry_contact"> >- <legend id="contact_lgd">Contact</legend> >-<ol> >+ <legend id="contact_lgd">Contact</legend><ol> > [% UNLESS nophone %] > <li> > [% IF ( mandatoryphone ) %] >@@ -494,7 +493,7 @@ > [% IF ( mandatoryemailpro ) %]<span class="required">Required</span>[% END %] > </li> > [% END %] >- [% UNLESS nofax %] >+ [% UNLESS nofax %] > <li> > [% IF ( mandatoryfax ) %] > <label for="fax" class="required"> >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 dab14e5..16e9f85 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 >@@ -19,7 +19,7 @@ > <div class="col-xs-6"> > <div id="patron-information"> > >- [% UNLESS ( I ) %][% IF ( othernames ) %]“[% othernames | html %]”[% END %] >+ [% UNLESS ( I ) %][% IF ( patron.othernames ) %]“[% patron.othernames %]”[% END %] > <div class = "address"> > <ul> > [% IF Koha.Preference( 'AddressFormat' ) %] >@@ -61,9 +61,9 @@ > <h3>Library use</h3> > <div class="rows"> > <ol> >- <li><span class="label">Card number: </span>[% cardnumber | html %]</li> >- <li><span class="label">Borrowernumber: </span> [% borrowernumber | html %]</li> >- <li><span class="label">Category: </span>[% categoryname | html %] ([% categorycode | html %])</li> >+ <li><span class="label">Card number: </span>[% patron.cardnumber %]</li> >+ <li><span class="label">Borrowernumber: </span> [% patron.borrowernumber %]</li> >+ <li><span class="label">Category: </span>[% patron.category.description %] ([% patron.categorycode %])</li> > <li><span class="label">Registration date: </span>[% dateenrolled | $KohaDates %]</li> > <li><span class="label">Expiration date: </span> > [% IF ( was_renewed ) %] >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 215eb9f..a89a13a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -239,15 +239,6 @@ > [% END %] > </ul> > </li> >- [% ELSIF guarantor %] >- <li> >- <span class="label">Guarantor:</span> >- [% IF guarantor.borrowernumber AND logged_in_user.can_see_patron_infos( guarantor ) %] >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.borrowernumber | uri %]">[% guarantor.firstname | html %] [% guarantor.surname | html %]</a> >- [% ELSE %] >- [% guarantor.firstname | html %] [% guarantor.surname | html %] >- [% END %] >- </li> > [% END %] > > [% IF ( primary_contact_method ) %] >diff --git a/members/moremember.pl b/members/moremember.pl >index 366f87b..e19faa4 100755 >--- a/members/moremember.pl >+++ b/members/moremember.pl >@@ -313,9 +313,6 @@ $template->param( > patron => $patron, > 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, > todaysdate => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }), >diff --git a/opac/opac-memberentry.pl b/opac/opac-memberentry.pl >index 9b417f3..d96587f 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.7.4
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