Bugzilla – Attachment 141103 Details for
Bug 10950
Add pronoun field to patron record
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 10950: (follow-up) Change display of pronoun fields
Bug-10950-follow-up-Change-display-of-pronoun-fiel.patch (text/plain), 5.83 KB, created by
Chris Cormack
on 2022-09-30 00:29:27 UTC
(
hide
)
Description:
Bug 10950: (follow-up) Change display of pronoun fields
Filename:
MIME Type:
Creator:
Chris Cormack
Created:
2022-09-30 00:29:27 UTC
Size:
5.83 KB
patch
obsolete
>From f177073dd84fb67cbf10ef5fb3c4c626e35b52ce Mon Sep 17 00:00:00 2001 >From: Lucas Gass <lucas@bywatersolutions.com> >Date: Mon, 29 Aug 2022 22:24:56 +0000 >Subject: [PATCH] Bug 10950: (follow-up) Change display of pronoun fields > >Signed-off-by: Andrew Fuerste-Henry <andrewfh@dubcolib.org> >Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> >--- > koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc | 5 ++++- > .../intranet-tmpl/prog/en/includes/patron-title.inc | 9 +++------ > .../intranet-tmpl/prog/en/modules/members/moremember.tt | 6 +++++- > 3 files changed, 12 insertions(+), 8 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc >index 926008ed94..be02b213ec 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc >@@ -25,7 +25,6 @@ > [% END %] > [% INCLUDE 'patron-title.inc' %] > </h5> >- > [% IF Koha.Preference('showLastPatron') %] > <input type="hidden" id="hiddenborrowernumber" value="[% patron.borrowernumber | html %]"> > <input type="hidden" id="hiddenborrowername" value="[% patron.surname | html %] [% patron.firstname | html %]"> >@@ -52,6 +51,10 @@ > > <ul class="patronbriefinfo"> > [% IF !(Koha.Preference('HidePersonalPatronDetailOnCirculation')) %] >+ [% IF patron.pronouns %] >+ <li class="patronpronouns">([% patron.pronouns | html %])</li> >+ [% END %] >+ > [% PROCESS 'display-address-style' %] > > [% IF ( patron.phone || patron.mobile || patron.phonepro ) %]<li class="patronphone"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc >index 59f4ff489d..d0a3267cf5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc >@@ -6,7 +6,6 @@ > [%- SET data.category_type = patron.category.category_type -%] > [%- SET data.surname = patron.surname -%] > [%- SET data.othernames = patron.othernames -%] >- [%- SET data.pronouns = patron.pronouns -%] > [%- SET data.firstname = patron.firstname -%] > [%- SET data.middle_name = patron.middle_name -%] > [%- SET data.cardnumber = patron.cardnumber -%] >@@ -16,7 +15,6 @@ > [%- SET data.category_type = borrower.category_type -%] > [%- SET data.surname = borrower.surname -%] > [%- SET data.othernames = borrower.othernames -%] >- [%- SET data.pronouns = borrower.pronouns -%] > [%- SET data.firstname = borrower.firstname -%] > [%- SET data.middle_name = borrower.middle_name -%] > [%- SET data.cardnumber = borrower.cardnumber -%] >@@ -26,7 +24,6 @@ > [%- SET data.category_type = category_type -%] > [%- SET data.surname = surname -%] > [%- SET data.othernames = othernames -%] >- [%- SET data.othernames = pronouns -%] > [%- SET data.firstname = firstname -%] > [%- SET data.middle_name = middle_name -%] > [%- SET data.cardnumber = cardnumber -%] >@@ -67,11 +64,11 @@ > [%- END -%] > [%- IF display_patron_name -%] > [%- IF data.category_type == 'I' -%] >- [%- data.surname | html %] [% IF data.othernames %] ([% data.othernames | html %])[% END -%] [% IF data.pronouns %]([% data.pronouns | html %])[% END %] >+ [%- data.surname | html %] [% IF data.othernames %] ([% data.othernames | html %])[% END -%] > [%- ELSIF invert_name -%] >- [% data.title | $raw %][%- data.surname | html %][% IF ( data.firstname ) %], [% data.firstname | html %][% END %][% IF data.middle_name %] [% data.middle_name | html %][% END %][% IF data.othernames %] ([% data.othernames | html %]) [% END -%][% IF data.pronouns %]([% data.pronouns | html %])[% END %] >+ [% data.title | $raw %][%- data.surname | html %][% IF ( data.firstname ) %], [% data.firstname | html %][% END %][% IF data.middle_name %] [% data.middle_name | html %][% END %][% IF data.othernames %] ([% data.othernames | html %]) [% END -%] > [%- ELSE -%] >- [% data.title | $raw %][%- data.firstname | html %][% IF data.middle_name %] [% data.middle_name | html %][% END %][% IF data.othernames %] ([% data.othernames | html %]) [% END %] [% data.surname | html -%][% IF data.pronouns %]([% data.pronouns | html %])[% END %] >+ [% data.title | $raw %][%- data.firstname | html %][% IF data.middle_name %] [% data.middle_name | html %][% END %][% IF data.othernames %] ([% data.othernames | html %]) [% END %] [% data.surname | html -%] > [%- END -%] > [%- IF display_cardnumber AND data.cardnumber %] ([% data.cardnumber | html %])[% END -%] > [%- ELSIF display_cardnumber -%] >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 9092166116..791693195d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -96,6 +96,11 @@ > </div> > > <h1>[% INCLUDE 'patron-title.inc' no_html = 1 %]</h1> >+ >+ [% IF patron.pronouns %] >+ <div class="patronpronouns">([% patron.pronouns | html %])</div> >+ [% END %] >+ > <div class="col-sm-6"> > > <div id="patron-information" class="patroninfo-section"> >@@ -110,7 +115,6 @@ > </div> > > [% IF ( patron.othernames ) %]<div>“[% patron.othernames | html %]”</div>[% END %] >- [% IF ( patron.pronouns ) %]<div>“[% patron.pronouns | html %]”</div>[% END %] > > <div class="address"> > <ul> >-- >2.20.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 10950
:
135883
|
135886
|
135887
|
135890
|
135908
|
135909
|
135957
|
136037
|
136058
|
136059
|
136060
|
136061
|
136062
|
136063
|
136064
|
139606
|
139607
|
139608
|
139609
|
139610
|
139611
|
139612
|
139615
|
139616
|
139617
|
139618
|
139619
|
139620
|
139621
|
139908
|
139968
|
139983
|
139984
|
139985
|
139986
|
139987
|
139988
|
139989
|
139990
|
139991
|
141094
|
141095
|
141096
|
141097
|
141098
|
141099
|
141100
|
141101
|
141102
| 141103