From e769e270eaeedc30db2debaaa3666a17bf973314 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
---
 koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt  | 6 +++---
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt | 6 ++++--
 2 files changed, 7 insertions(+), 5 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 d86ed90..8a4705b 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
@@ -462,7 +462,7 @@
                                 </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>
@@ -571,8 +571,8 @@
                                 </div>
                                 <div class="medium">
                                     <span class="label medium">Request type:</span>
-                                    % type = request.get_type %]
-                                    [% type || '<span>N/A</span>' | html %]
+                                    [% type = request.get_type %]
+                                    [% IF type %][% type | html %][% ELSE %]<span>N/A</span>[% END %]
                                 </div>
                                 <div class="cost">
                                     <span class="label cost">Cost:</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 f0ee2d7..779c781 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
@@ -135,7 +135,9 @@
                                         [% 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>
@@ -179,7 +181,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>
-- 
2.1.4