Bugzilla – Attachment 134780 Details for
Bug 30603
Sort 1 and Sort 2 on patron form are on longer free text when AV categories are empty
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30603: Fix other occurrences
Bug-30603-Fix-other-occurrences.patch (text/plain), 11.60 KB, created by
Jonathan Druart
on 2022-05-09 07:43:58 UTC
(
hide
)
Description:
Bug 30603: Fix other occurrences
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2022-05-09 07:43:58 UTC
Size:
11.60 KB
patch
obsolete
>From 3009e8c123c47443210a9b01ea013300b0ad90ec Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Mon, 9 May 2022 09:42:30 +0200 >Subject: [PATCH] Bug 30603: Fix other occurrences > >--- > .../prog/en/includes/member-alt-address-style.inc | 2 +- > .../prog/en/includes/member-main-address-style.inc | 2 +- > .../intranet-tmpl/prog/en/modules/circ/article-requests.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +- > .../intranet-tmpl/prog/en/modules/circ/pendingreserves.tt | 2 +- > .../intranet-tmpl/prog/en/modules/circ/request-article.tt | 2 +- > .../intranet-tmpl/prog/en/modules/circ/waitingreserves.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt | 4 ++-- > .../opac-tmpl/bootstrap/en/includes/av-build-dropbox.inc | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt | 4 ++-- > 11 files changed, 13 insertions(+), 13 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 ad250094e01..f358763c3b7 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 >@@ -57,7 +57,7 @@ > > [% BLOCK 'alt-address-style_roadtypes' %] > [% SET roadtypes = AuthorisedValues.GetAuthValueDropbox('ROADTYPE') %] >- [% IF roadtypes %] >+ [% IF roadtypes.count %] > [% UNLESS noB_streettype %] > <li> > [% IF ( mandatoryB_streettype ) %] >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 055319f1399..a5c95b9c557 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 >@@ -48,7 +48,7 @@ > > [% BLOCK 'address-style_roadtypes' %] > [% SET roadtypes = AuthorisedValues.GetAuthValueDropbox('ROADTYPE') %] >- [% IF roadtypes %] >+ [% IF roadtypes.count %] > [% UNLESS nostreettype %] > <li> > [% IF ( mandatorystreettype ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt >index 1c559b5330b..562854249e5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt >@@ -102,7 +102,7 @@ > > <fieldset class="action"> > [% SET ar_cancellation = AuthorisedValues.GetAuthValueDropbox('AR_CANCELLATION') %] >- [% IF ar_cancellation %] >+ [% IF ar_cancellation.count %] > <label for="cancellation-reason" class="col-sm-4">Cancellation reason: </label> > <select class="cancellation-reason col-sm-8" name="cancellation-reason" id="modal-cancellation-reason"> > <option value="" selected>Other reasons</option> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >index 6b5ef7c81da..ea5cd7b55c5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -902,7 +902,7 @@ > <input type="submit" class="cancel" name="submit" value="Cancel marked holds" /> > > [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %] >- [% IF hold_cancellation %] >+ [% IF hold_cancellation.count %] > <select name="cancellation-reason"> > <option value="">No reason given</option> > [% FOREACH reason IN hold_cancellation %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >index aa28b16d016..61203de92ea 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >@@ -189,7 +189,7 @@ > <input type="hidden" name="reserve_id" value="[% hold.reserve_id | html %]" /> > > [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %] >- [% IF hold_cancellation %] >+ [% IF hold_cancellation.count %] > <div class="form-group"> > <label for="cancellation-reason">Cancellation reason:</label> > <select class="cancellation-reason" name="cancellation-reason" id="cancellation-reason"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt >index a78b17fda79..243f6e068ba 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt >@@ -33,7 +33,7 @@ > > <fieldset class="action"> > [% SET ar_cancellation = AuthorisedValues.GetAuthValueDropbox('AR_CANCELLATION') %] >- [% IF ar_cancellation %] >+ [% IF ar_cancellation.count %] > <label for="cancellation-reason" class="col-sm-4">Cancellation reason: </label> > <select class="cancellation-reason col-sm-8" name="cancellation-reason" id="modal-cancellation-reason"> > <option value="" selected>Other reasons</option> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >index f9aeb48443e..b6e06f7bc95 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >@@ -155,7 +155,7 @@ > > <fieldset class="action"> > [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %] >- [% IF hold_cancellation %] >+ [% IF hold_cancellation.count %] > <label for="cancellation-reason">Cancellation reason: </label> > <select class="cancellation-reason" name="modal-cancellation-reason" id="modal-cancellation-reason"> > <option value="">No reason given</option> >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 dfd08255f8a..92683ec57cb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -775,7 +775,7 @@ > <input type="submit" class="cancel" name="submit" value="Cancel marked holds" /> > > [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %] >- [% IF hold_cancellation %] >+ [% IF hold_cancellation.count %] > <label for="cancellation-reason">Cancellation reason:</label> > <select name="cancellation-reason"> > <option value="">No reason given</option> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >index e3ad31601c0..59f215ebd2a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >@@ -935,7 +935,7 @@ > <input type="submit" name="submit" value="Update hold(s)" /> <button class="cancel_selected_holds" data-bulk="true"></button> > <fieldset id="cancellation-reason-fieldset" class="action"> > [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %] >- [% IF hold_cancellation %] >+ [% IF hold_cancellation.count %] > <label for="cancellation-reason">Cancellation reason: </label> > <select class="cancellation-reason" name="cancellation-reason" id="cancellation-reason"> > <option value="">No reason given</option> >@@ -1121,7 +1121,7 @@ > > <fieldset class="action"> > [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %] >- [% IF hold_cancellation %] >+ [% IF hold_cancellation.count %] > <label for="cancellation-reason">Cancellation reason: </label> > <select class="cancellation-reason" name="modal-cancellation-reason" id="modal-cancellation-reason"> > <option value="">No reason given</option> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/av-build-dropbox.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/av-build-dropbox.inc >index 9b833fcfe0e..2c2ebeac50a 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/av-build-dropbox.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/av-build-dropbox.inc >@@ -9,7 +9,7 @@ > [% SET avs = AuthorisedValues.GetAuthValueDropbox( category ) %] > [% DEFAULT class = '' size = 20 %] > >-[% IF avs %] >+[% IF avs.count %] > [% IF required %] > <select id="[% name | html %]" name="[% name | html %]" class="[% class | html %]" required="required"> > [% ELSE %] >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 4e1a4fd692b..a7c60c48b21 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt >@@ -427,7 +427,7 @@ > [% IF Koha.Preference('AddressFormat') != 'de' %][% INCLUDE streetnumber %][% END %] > > [% SET roadtypes = AuthorisedValues.GetAuthValueDropbox('ROADTYPE') %] >- [% IF roadtypes %] >+ [% IF roadtypes.count %] > [% UNLESS hidden.defined('streettype') %] > <li> > <label for="borrower_streettype" class="[% required.streettype | html %]">Street type:</label> >@@ -651,7 +651,7 @@ > > <ol> > [% SET roadtypes = AuthorisedValues.GetAuthValueDropbox('ROADTYPE') %] >- [% IF roadtypes %] >+ [% IF roadtypes.count %] > [% UNLESS hidden.defined('B_streettype') %] > <li> > <label for="borrower_B_streettype" class="[% required.B_streettype | html %]">Street type:</label> >-- >2.25.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 30603
:
134778
|
134779
|
134780
|
134798
|
134799
|
134812
|
134813