Bugzilla – Attachment 124515 Details for
Bug 28392
streettype and B_streettype cannot be hidden via BorrowerUnwantedField
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 28392: make streettype and B_streettype work with BorrowerUnwantedField
Bug-28392-make-streettype-and-Bstreettype-work-wit.patch (text/plain), 5.77 KB, created by
Joonas Kylmälä
on 2021-09-05 13:00:44 UTC
(
hide
)
Description:
Bug 28392: make streettype and B_streettype work with BorrowerUnwantedField
Filename:
MIME Type:
Creator:
Joonas Kylmälä
Created:
2021-09-05 13:00:44 UTC
Size:
5.77 KB
patch
obsolete
>From ffeb07c6cb668c7d443d6bbffa53f265506dc12a Mon Sep 17 00:00:00 2001 >From: Lucas Gass <lucas@bywatersolutions.com> >Date: Wed, 1 Sep 2021 14:17:21 +0000 >Subject: [PATCH] Bug 28392: make streettype and B_streettype work with > BorrowerUnwantedField >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >To test: >1. Add values to the AV ROADTYPE >2. Go to the BorrowerUnwantedField system preference and attempt to hide streettype and B_streettype. >3. It doesn't work, the fields still show. >4. Apply patch >5. Repeat step 2, it should work now. > >Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> > >Signed-off-by: Joonas Kylmälä <joonas.kylmala@iki.fi> >--- > .../en/includes/member-alt-address-style.inc | 38 ++++++++++--------- > .../en/includes/member-main-address-style.inc | 38 ++++++++++--------- > 2 files changed, 40 insertions(+), 36 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc >index 17c1d99fc3..ad250094e0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc >@@ -58,25 +58,27 @@ > [% BLOCK 'alt-address-style_roadtypes' %] > [% SET roadtypes = AuthorisedValues.GetAuthValueDropbox('ROADTYPE') %] > [% IF roadtypes %] >- <li> >- [% IF ( mandatoryB_streettype ) %] >- <label for="B_streettype" class="required"> >- [% ELSE %] >- <label for="B_streettype"> >- [% END %] >- Street type: </label> >- <select name="B_streettype"> >- <option value=""></option> >- [% FOR roadtype IN roadtypes %] >- [% IF roadtype.authorised_value == patron.B_streettype %] >- <option value="[% roadtype.authorised_value | html %]" selected="selected">[% roadtype.lib | html %]</option> >- [% ELSE %] >- <option value="[% roadtype.authorised_value | html %]">[% roadtype.lib | html %]</option> >- [% END %] >+ [% UNLESS noB_streettype %] >+ <li> >+ [% IF ( mandatoryB_streettype ) %] >+ <label for="B_streettype" class="required"> >+ [% ELSE %] >+ <label for="B_streettype"> > [% END %] >- </select> >- [% IF ( mandatoryB_streettype ) %]<span class="required">Required</span>[% END %] >- </li> >+ Street type: </label> >+ <select name="B_streettype"> >+ <option value=""></option> >+ [% FOR roadtype IN roadtypes %] >+ [% IF roadtype.authorised_value == patron.B_streettype %] >+ <option value="[% roadtype.authorised_value | html %]" selected="selected">[% roadtype.lib | html %]</option> >+ [% ELSE %] >+ <option value="[% roadtype.authorised_value | html %]">[% roadtype.lib | html %]</option> >+ [% END %] >+ [% END %] >+ </select> >+ [% IF ( mandatoryB_streettype ) %]<span class="required">Required</span>[% END %] >+ </li> >+ [% END %] > [% END %] > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc >index 609509c943..055319f139 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc >@@ -49,25 +49,27 @@ > [% BLOCK 'address-style_roadtypes' %] > [% SET roadtypes = AuthorisedValues.GetAuthValueDropbox('ROADTYPE') %] > [% IF roadtypes %] >- <li> >- [% IF ( mandatorystreettype ) %] >- <label for="streettype" class="required"> >- [% ELSE %] >- <label for="streettype"> >- [% END %] >- Street type: </label> >- <select name="streettype"> >- <option value=""></option> >- [% FOR roadtype IN roadtypes %] >- [% IF roadtype.authorised_value == patron.streettype %] >- <option value="[% roadtype.authorised_value | html %]" selected="selected">[% roadtype.lib | html %]</option> >- [% ELSE %] >- <option value="[% roadtype.authorised_value | html %]">[% roadtype.lib | html %]</option> >- [% END %] >+ [% UNLESS nostreettype %] >+ <li> >+ [% IF ( mandatorystreettype ) %] >+ <label for="streettype" class="required"> >+ [% ELSE %] >+ <label for="streettype"> > [% END %] >- </select> >- [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %] >- </li> >+ Street type: </label> >+ <select name="streettype"> >+ <option value=""></option> >+ [% FOR roadtype IN roadtypes %] >+ [% IF roadtype.authorised_value == patron.streettype %] >+ <option value="[% roadtype.authorised_value | html %]" selected="selected">[% roadtype.lib | html %]</option> >+ [% ELSE %] >+ <option value="[% roadtype.authorised_value | html %]">[% roadtype.lib | html %]</option> >+ [% END %] >+ [% END %] >+ </select> >+ [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %] >+ </li> >+ [% END %] > [% END %] > [% END %] > >-- >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 28392
:
124370
|
124371
| 124515