From 6499d28dbdc11951ca33270f5d23b9e960c97fb5 Mon Sep 17 00:00:00 2001
From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
Date: Fri, 5 Oct 2018 08:56:45 +0100
Subject: [PATCH] Bug 20941: (follow-up) Update N/A handling

Modify the conditional display of N/A in accordance with comment #17
---
 .../intranet-tmpl/prog/en/modules/ill/ill-requests.tt    | 12 ++++++------
 .../opac-tmpl/bootstrap/en/modules/opac-illrequests.tt   | 16 +++++++++++-----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
index 918d41556c..7726ca525e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
@@ -438,11 +438,11 @@
                                 </li>
                                 <li class="medium">
                                     <label class="medium">Request type:</label>
-                                    [% type || '<span>N/A</span>' | html %]
+                                    [% IF type %][% type | html %][% ELSE %]<span>N/A</span>[% END %]
                                 </li>
                                 <li class="cost">
                                     <label class="cost">Cost:</label>
-                                    [% request.cost || '<span>N/A</span>' | html %]
+                                    [% IF request.cost %][% request.cost | html %][% ELSE %]<span>N/A</span>[% END %]
                                 </li>
                                 <li class="req_id">
                                     <label class="req_id">Request number:</label>
@@ -510,7 +510,7 @@
                             <div class="rows">
                                 <div class="orderid">
                                     <span class="label orderid">Order ID:</span>
-                                    [% request.orderid || '<span>N/A</span>' | html %]
+                                    [% IF request.orderid %][% request.orderid | html %][% ELSE %]<span>N/A</span>[% END %]
                                 </div>
                                 <div class="borrowernumber">
                                     <span class="label borrowernumber">Patron:</span>
@@ -522,7 +522,7 @@
 
                                 <div class="biblio_id">
                                     <span class="label biblio_id">Bibliographic record ID:</span>
-                                    [% request.biblio_id || '<span>N/A</span>' | html %]
+                                    [% IF request.biblio_id %][% request.biblio_id | html %][% ELSE %]<span>N/A</span>[% END %]
                                 </div>
                                 <div class="branchcode">
                                     <span class="label branchcode">Library:</span>
@@ -539,11 +539,11 @@
                                 <div class="medium">
                                     <span class="label medium">Request type:</span>
                                     % type = request.get_type %]
-                                    [% type || '<span>N/A</span>' | html %]
+                                    [% IF type %][% type | html %][% ELSE %]<span>N/A</span>[% END %]
                                 </div>
                                 <div class="cost">
                                     <span class="label cost">Cost:</span>
-                                    [% request.cost || '<span>N/A</span>' | html %]
+                                    [% IF request.cost %][% request.cost | html %][% ELSE %]<span>N/A</span>[% END %]
                                 </div>
                                 <div class="req_id">
                                     <span class="label req_id">Request number:</span>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
index e3ff91f353..34b1183fe3 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
@@ -126,10 +126,16 @@
                                 [% status = request.status | html %]
                                 [% type = request.get_type %]
                                 <tr>
-                                    <td>[% request.metadata.Author || '<span>N/A</span>' | html %]</td>
-                                    <td>[% request.metadata.Title || '<span>N/A</span>' | html %]</td>
+                                    <td>
+                                        [% IF request.metadata.Author %][% request.metadata.Author | html %][% ELSE %]<span>N/A</span>[% END %]
+                                    </td>
+                                    <td>
+                                        [% IF request.metadata.Title %][% request.metadata.Title | html %][% ELSE %]<span>N/A</span>[% END %]
+                                    </td>
                                     <td>[% request.backend | html %]</td>
-                                    <td>[% type || '<span>N/A</span>' | html %]</td>
+                                    <td>
+                                        [% IF type %][% type | html %][% ELSE %]<span>N/A</span>[% END %]
+                                    </td>
                                     <td>[% request.capabilities.$status.name | html %]</td>
                                     <td>[% request.placed | html %]</td>
                                     <td>[% request.updated | html %]</td>
@@ -169,7 +175,7 @@
                                     </li>
                                     <li>
                                         <label for="medium">Request type:</label>
-                                        [% type || '<span>N/A</span>' | html %]
+                                        [% IF type %][% type | html %][% ELSE %]<span>N/A</span>[% END %]
                                     </li>
                                     <li>
                                         <label for="placed">Request placed:</label>
@@ -194,7 +200,7 @@
                                 [% FOREACH meta IN request.metadata %]
                                     <div class="requestattr-[% meta.key | html %]">
                                         <span class="label">[% meta.key | html %]:</span>
-                                        [% meta.value || '<span>N/A</span>' | html %]
+                                        [% IF meta.value %][% meta.value | html %][% ELSE %]<span>N/A</span>[% END %]
                                     </div>
                                 [% END %]
                             </div>
-- 
2.11.0