From 1473575317423b01e03d5eb09ab03625f0ad0a49 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

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 .../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 ad250094e0..f358763c3b 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 055319f139..a5c95b9c55 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 1c559b5330..562854249e 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 6b5ef7c81d..ea5cd7b55c 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 aa28b16d01..61203de92e 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 a78b17fda7..243f6e068b 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 f9aeb48443..b6e06f7bc9 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 dfd08255f8..92683ec57c 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 e3ad31601c..59f215ebd2 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 9b833fcfe0..2c2ebeac50 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 4e1a4fd692..a7c60c48b2 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.39.5